Commit 05e2c170 authored by Elian Kraja's avatar Elian Kraja Committed by Michele Carignani
Browse files

Updating from v2.0.9 to v2.1.1. Cause 8: MEC service management API

parent a431da9b
Loading
Loading
Loading
Loading
Loading
+57 −23
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ TC_MEC_SRV_APPSAQ_001_OK
    ...    Check that the IUT responds with a list of available MEC services
    ...    for a given application instance when queried by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.6.3.1
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.6.3.1
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES

@@ -33,7 +33,7 @@ TC_MEC_SRV_APPSAQ_001_BR
    ...   Check that the IUT responds with an error when
    ...    a request with incorrect parameters is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.6.3.1
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.6.3.1

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES

@@ -48,14 +48,14 @@ TC_MEC_SRV_APPSAQ_002_OK
    ...    instances when a new service for a given application instance is registered
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.6.3.4
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Create new service    ServiceInfo    ${APP_INSTANCE_ID}
    Check HTTP Response Status Code Is    201
    Check HTTP Response Body Json Schema Is    ServiceInfo
    Check HTTP Response Header Contains    Location
#    Check Result Contains    ${response['body']['ServiceInfo']}    serName    ${SERVICE_NAME}
    Check Result Contains    ${response['body']}    serName    ${NEW_SERVICE_NAME}


TC_MEC_SRV_APPSAQ_002_BR
@@ -63,8 +63,8 @@ TC_MEC_SRV_APPSAQ_002_BR
    ...    Check that the IUT responds with an error when
    ...    a request with incorrect parameters is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.6.3.4
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.6.3.4
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Create new service    ServiceInfoError    ${APP_INSTANCE_ID}
@@ -76,8 +76,8 @@ TC_MEC_SRV_APPSAQ_002_NF
    ...    Check that the IUT responds with an error when
    ...    a request for an unknown URI is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.6.3.4
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.6.3.4
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Create new service    ServiceInfo    ${NON_EXISTENT_APP_INSTANCE_ID}
@@ -89,14 +89,14 @@ TC_MEC_SRV_APPSAQ_003_OK
    ...    Check that the IUT responds with the information on a specific service
    ...    for a given application instance when queried by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.1
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.1
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Get individual service    ${APP_INSTANCE_ID}    ${SERVICE_ID}
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    ServiceInfo
    Check Result Contains    ${response['body']['ServiceInfo']}    serInstanceId    ${SERVICE_ID}
    Check Result Contains    ${response['body']}    serInstanceId    ${SERVICE_ID}


TC_MEC_SRV_APPSAQ_003_NF
@@ -104,7 +104,7 @@ TC_MEC_SRV_APPSAQ_003_NF
    ...    Check that the IUT responds with an error when
    ...    a request for an unknown URI is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.1
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.1

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Get individual service    ${APP_INSTANCE_ID}    ${NON_EXISTENT_SERVICE_ID}
@@ -116,14 +116,14 @@ TC_MEC_SRV_APPSAQ_004_OK
    ...    Check that the IUT updates a service information for a given
    ...    application instance when commanded by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Update service    ${APP_INSTANCE_ID}    ${SERVICE_ID}    ServiceInfoUpdated
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    ServiceInfo
    #Check Result Contains    ${response['body']['ServiceInfo']}    version    ${SVC_NEW_VERSION}
    Check Result Contains    ${response['body']}    version    ${SVC_NEW_VERSION}


TC_MEC_SRV_APPSAQ_004_BR
@@ -131,8 +131,8 @@ TC_MEC_SRV_APPSAQ_004_BR
    ...    Check that the IUT responds with an error when
    ...    a request with incorrect parameters is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Update service    ${APP_INSTANCE_ID}    ${SERVICE_ID}    ServiceInfoUpdatedError
@@ -144,8 +144,8 @@ TC_MEC_SRV_APPSAQ_004_NF
    ...    Check that the IUT responds with an error when
    ...    a request for an unknown URI is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Update service    ${APP_INSTANCE_ID}    ${NON_EXISTENT_SERVICE_ID}    ServiceInfoUpdated
@@ -157,14 +157,39 @@ TC_MEC_SRV_APPSAQ_004_PF
    ...    Check that the IUT responds with an error when
    ...    a request sent by a MEC Application doesn't comply with a required condition
    ...
    ...    Reference    ETSI GS MEC 011 V2.0.9, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/v2.0.9/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.2
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Update service with invalid etag     ${APP_INSTANCE_ID}    ${SERVICE_ID}    ServiceInfoUpdated
    Check HTTP Response Status Code Is    412


TC_MEC_SRV_APPSAQ_005_OK
    [Documentation]
    ...    Check that the IUT executes the deletion of a service 
    ...    for a given application instance when requested by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.1
    ...    OpenAPI    https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Remove individual service    ${APP_INSTANCE_ID}    ${SERVICE_ID}
    Check HTTP Response Status Code Is    204


TC_MEC_SRV_APPSAQ_005_NF
    [Documentation]
    ...    Check that the IUT responds with an error when
    ...    a request for deletion of a unknown service is sent by a MEC Application
    ...
    ...    Reference    ETSI GS MEC 011 V2.1.1, clause 8.2.7.3.1

    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
    Remove individual service    ${APP_INSTANCE_ID}    ${NON_EXISTENT_SERVICE_ID}
    Check HTTP Response Status Code Is    404



*** Keywords ***
Get a list of mecService of an application instance with parameters
@@ -211,7 +236,7 @@ Update service
    Set Headers    {"Authorization":"${TOKEN}"}
    ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
    ${body}=    Get File    ${file}
    Post    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/services/${serviceId}    ${body}
    PUT    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/services/${serviceId}    ${body}
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output}
    
@@ -223,6 +248,15 @@ Update service with invalid etag
    Update service    ${appInstanceId}    ${serviceId}    ${content}
    

Remove individual service
    [Arguments]    ${appInstanceId}    ${serviceName} 
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Authorization":"${TOKEN}"}
    Delete    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/services/${serviceName}
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output} 
    

# Check Plaform IUT notifies the MEC Application instances
    # [Documentation]
    # ...    
+4 −13
Original line number Diff line number Diff line
@@ -18,17 +18,8 @@ ${SERVICE_ID} e0deee2b-6e50-4f33-ab09-8bf0585025d3
${NON_EXISTENT_SERVICE_ID}          NON_EXISTENT_SERVICE_ID
${INVALID_ETAG}                     INVALID_ETAG

# ${SUBSCRIPTION_TYPE}                MobilityProcedureSubscription
# ${SUBSCRIPTION_ID}                  e0deee2b-6e50-4f33-ab09-8bf0585025d3
# ${NON_EXISTENT_SUBSCRIPTION_ID}     NON_EXISTENT_SUBSCRIPTION_ID
# ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}     NON_EXISTENT_APP_MOBILITY_SERVICE_ID
## this parameter should be the same as in jsons/ServiceInfo.json on param serName
${NEW_SERVICE_NAME}                NEW_SERVICE_NAME

# # 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
## this parameter should be the same as in jsons/ServiceInfoUpdated.json on param sversion
${SVC_NEW_VERSION}                 v2.0
 No newline at end of file
+42 −0
Original line number Diff line number Diff line
{
  "serName": "NEW_SERVICE_NAME",
  "version": "reprehenderit Ut non commodo",
  "state": "INACTIVE",
  "transportInfo": {
    "id": "labore ut Excepteur sunt ipsum",
    "name": "in minim enim",
    "type": "MB_ROUTING",
    "protocol": "veniam aliqua cillum in",
    "version": "exercitation pariatur",
    "endpoint": {
      "addresses": [
        {
          "host": "sint culpa laboris",
          "port": 10968
        }
      ]
    },
    "security": {
      "oAuth2Info": {
        "grantTypes": [
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_CLIENT_CREDENTIALS"
        ],
        "tokenEndpoint": "https://RXjkuoqKaR.nskcJZJsyoIFJ0k86hJdxq.eTHEGqxAybM3DEZlUlYQpZ47s6RR+O9gyFrLbO92,9"
      }
    },
    "description": "dolor occaecat pariatur ex do"
  },
  "serializer": "XML",
  "serInstanceId": "cillum nostrud minim consectetur proident",
  "serCategory": {
    "href": "http://VWwswcAtAylGx.usasPjZ+bqQIHCMc7FfToVvk2M.SYAWYvSDKGSRL7Z.rxyfC0goFNZtoGJrlFc89,",
    "id": "consectetur et eiusmod",
    "name": "ea ipsum irure mollit et",
    "version": "et"
  },
  "scopeOfLocality": "ZONE",
  "consumedLocalOnly": true,
  "isLocal": false
}
 No newline at end of file
+42 −0
Original line number Diff line number Diff line
{
  "Name": "WRONG_PARAMETER_NAME",
  "version": "reprehenderit Ut non commodo",
  "state": "INACTIVE",
  "transportInfo": {
    "id": "labore ut Excepteur sunt ipsum",
    "name": "in minim enim",
    "type": "MB_ROUTING",
    "protocol": "veniam aliqua cillum in",
    "version": "exercitation pariatur",
    "endpoint": {
      "addresses": [
        {
          "host": "sint culpa laboris",
          "port": 10968
        }
      ]
    },
    "security": {
      "oAuth2Info": {
        "grantTypes": [
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_CLIENT_CREDENTIALS"
        ],
        "tokenEndpoint": "https://RXjkuoqKaR.nskcJZJsyoIFJ0k86hJdxq.eTHEGqxAybM3DEZlUlYQpZ47s6RR+O9gyFrLbO92,9"
      }
    },
    "description": "dolor occaecat pariatur ex do"
  },
  "serializer": "XML",
  "serInstanceId": "cillum nostrud minim consectetur proident",
  "serCategory": {
    "href": "http://VWwswcAtAylGx.usasPjZ+bqQIHCMc7FfToVvk2M.SYAWYvSDKGSRL7Z.rxyfC0goFNZtoGJrlFc89,",
    "id": "consectetur et eiusmod",
    "name": "ea ipsum irure mollit et",
    "version": "et"
  },
  "scopeOfLocality": "ZONE",
  "consumedLocalOnly": true,
  "isLocal": false
}
 No newline at end of file
+42 −0
Original line number Diff line number Diff line
{
  "serName": "NEW_SERVICE_NAME",
  "version": "v2.0",
  "state": "INACTIVE",
  "transportInfo": {
    "id": "labore ut Excepteur sunt ipsum",
    "name": "in minim enim",
    "type": "MB_ROUTING",
    "protocol": "veniam aliqua cillum in",
    "version": "exercitation pariatur",
    "endpoint": {
      "addresses": [
        {
          "host": "sint culpa laboris",
          "port": 10968
        }
      ]
    },
    "security": {
      "oAuth2Info": {
        "grantTypes": [
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_IMPLICIT_GRANT",
          "OAUTH2_CLIENT_CREDENTIALS"
        ],
        "tokenEndpoint": "https://RXjkuoqKaR.nskcJZJsyoIFJ0k86hJdxq.eTHEGqxAybM3DEZlUlYQpZ47s6RR+O9gyFrLbO92,9"
      }
    },
    "description": "dolor occaecat pariatur ex do"
  },
  "serializer": "XML",
  "serInstanceId": "cillum nostrud minim consectetur proident",
  "serCategory": {
    "href": "http://VWwswcAtAylGx.usasPjZ+bqQIHCMc7FfToVvk2M.SYAWYvSDKGSRL7Z.rxyfC0goFNZtoGJrlFc89,",
    "id": "consectetur et eiusmod",
    "name": "ea ipsum irure mollit et",
    "version": "et"
  },
  "scopeOfLocality": "ZONE",
  "consumedLocalOnly": true,
  "isLocal": false
}
 No newline at end of file
Loading