MEC011/SRV/APPSUB/PlatAppSubscriptions.robot

@@ -4,7 +4,7 @@ Documentation
 ...    A test suite for validating Application Subscriptions (APPSUB) operations.
 
 Resource    ../../../GenericKeywords.robot
-Resource    environment/variables.txt
+Resource    environment/variables_sandbox.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem    
 Library     String
@@ -23,7 +23,7 @@ TC_MEC_MEC011_SRV_APPSUB_001_OK
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]  Create new subscription    ${APP_INSTANCE_ID}    AppTerminationNotificationSubscription
     ${elements} =  Split String    ${response['body']['_links']['self']['href']}     /
-    Set Suite Variable    ${SUB_ID}    ${elements[3]}
+    Set Suite Variable    ${SUB_ID}    ${elements[-1]}
     Get Subscriptions list    ${APP_INSTANCE_ID}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    SubscriptionsLinkList
@@ -38,7 +38,7 @@ TC_MEC_MEC011_SRV_APPSUB_001_NF
     ...    Reference          "ETSI GS MEC 011 3.2.1, clause 5.2.6",
     ...                       "ETSI GS MEC 011 3.2.1, clause 7.2.3.3.1"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
-    [TearDown]   Remove subscription   ${NON_EXISTENT_APP_INSTANCE_ID}    ${SUB_ID}
+    [Setup]   Remove subscription   ${NON_EXISTENT_APP_INSTANCE_ID}    ${SUB_ID}
     Get Subscriptions list    ${NON_EXISTENT_APP_INSTANCE_ID}
     Check HTTP Response Status Code Is    404
 
@@ -51,15 +51,16 @@ TC_MEC_MEC011_SRV_APPSUB_002_OK
     ...    Reference   "ETSI GS MEC 011 3.2.1, clause 5.2.6",
     ...                "ETSI GS MEC 011 3.2.1, clause 7.2.3.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
+    
     Create new subscription    ${APP_INSTANCE_ID}    AppTerminationNotificationSubscription
+    ${CALLBACK_REF}   Get value entry from JSON file    AppTerminationNotificationSubscription  callbackReference
     ${elements} =  Split String    ${response['body']['_links']['self']['href']}     /
-    Set Suite Variable    ${SUB_ID}    ${elements[3]}
- 
+    Set Suite Variable    ${SUB_ID}    ${elements[-1]}
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    AppTerminationNotificationSubscription
     Check HTTP Response Header Contains    Location
     Check Response Contains    ${response['body']}    subscriptionType    AppTerminationNotificationSubscription
-    Check Response Contains    ${response['body']}    callbackReference    ${APP_TERM_NOTIF_CALLBACK_URI}
+    Check Response Contains    ${response['body']}    callbackReference    ${CALLBACK_REF}
     [TearDown]   Remove subscription   ${APP_INSTANCE_ID}    ${SUB_ID}
 
 
@@ -85,7 +86,7 @@ TC_MEC_MEC011_SRV_APPSUB_003_OK
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create new subscription    ${APP_INSTANCE_ID}    AppTerminationNotificationSubscription
     ${elements} =  Split String    ${response['body']['_links']['self']['href']}     /
-    Set Suite Variable    ${SUB_ID}    ${elements[3]} 
+    Set Suite Variable    ${SUB_ID}    ${elements[-1]} 
     Get individual subscription    ${APP_INSTANCE_ID}    ${SUB_ID} 
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    AppTerminationNotificationSubscription
@@ -114,7 +115,9 @@ TC_MEC_MEC011_SRV_APPSUB_004_OK
     ...                 "ETSI GS MEC 011 3.2.1, clause 7.2.4.3.5"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create new subscription    ${APP_INSTANCE_ID}    AppTerminationNotificationSubscription
-    Remove subscription    ${APP_INSTANCE_ID}    ${SUBSCRIPTION_ID}
+    ${elements} =  Split String    ${response['body']['_links']['self']['href']}     /
+    Set Suite Variable    ${SUB_ID}    ${elements[-1]}
+    Remove subscription    ${APP_INSTANCE_ID}    ${SUB_ID}
     Check HTTP Response Status Code Is    204
 
 

MEC011/SRV/APPSUB/environment/variables.txt

@@ -10,7 +10,10 @@ ${apiName}        mec_app_support
 ${apiVersion}     v1
 
 # Specific variables
-${APP_INSTANCE_ID}                      5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+
+# Specific variables
+#${APP_INSTANCE_ID}                      5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+${APP_INSTANCE_ID}                  f1e4d448-e277-496b-bf63-98391cfd20fb
 ${NON_EXISTENT_APP_INSTANCE_ID}         NON_ESISTENT_APP_INSTANCE_ID
 
 

MEC011/SRV/APPSUB/environment/variables_sandbox.txt

+*** Variables ***
+####Env variable for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                     try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  /<identifier_provided_by_the_sandbox>/mep1 
+${apiName}        mec_app_support
+${apiVersion}     v1
+
+
+# Specific variables
+
+# Specific variables
+#${APP_INSTANCE_ID}                      5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+${APP_INSTANCE_ID}                  f1e4d448-e277-496b-bf63-98391cfd20fb
+${NON_EXISTENT_APP_INSTANCE_ID}         NON_ESISTENT_APP_INSTANCE_ID
+
+
+${APP_TERM_NOTIF_CALLBACK_URI}          http://127.0.0.1/subscribe
+
+${SUBSCRIPTION_ID}                      e0deee2b-6e50-4f33-ab09-8bf0585025d3
+${NON_EXISTENT_SUBSCRIPTION_ID}     NON_EXISTENT_SUBSCRIPTION_ID
+${SUB_ID}
+
+
+# ${SUBSCRIPTION_TYPE}                MobilityProcedureSubscription
+# ${SUBSCRIPTION_ID}                  e0deee2b-6e50-4f33-ab09-8bf0585025d3
+# 
+# ${NON_EXISTENT_APP_MOBILITY_SERVICE_ID}     NON_EXISTENT_APP_MOBILITY_SERVICE_ID
+
+# # 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

MEC011/SRV/APPSUB/jsons/AppTerminationNotificationSubscription.json

@@ -6,5 +6,5 @@
       "href": "https://somewhere.com/mecAppSuptApi/example"
     }
   },
-  "appInstanceId": "appIntanceId"
+  "appInstanceId": "f1e4d448-e277-496b-bf63-98391cfd20fb"
 }
\ No newline at end of file

MEC011/SRV/CONFTASK/PlatConfirmation.robot

@@ -4,18 +4,15 @@ Documentation
 ...    A test suite for validating Platform Configuration (CONF) operations.
 
 Resource    ../../../GenericKeywords.robot
-Resource    environment/variables.txt
-Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
+#Resource    environment/variables.txt
+Resource    environment/variables_sandbox.txt
+Library     REST    ${SCHEMA}://${HOST}:${PORT}  
 Library     OperatingSystem 
 
 Default Tags    TC_MEC_SRV_CONF
 
 
-*** Variables ***
-
-
 *** Test Cases ***
-
 TC_MEC_MEC011_SRV_CONFTASK_001_OK
     [Documentation]
     ...    Check that the IUT responds that it has completed 
@@ -71,7 +68,7 @@ TC_MEC_MEC011_SRV_CONFTASK_002_NF
     ...    "ETSI GS MEC 011 3.2.1, clause 7.1.4.3",
     ...    "ETSI GS MEC 011 3.2.1, clause 7.2.11.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
-    [Teardown]   Delete MEC application instance profile   ${NON_EXISTING_APP_INSTANCE_ID}
+    [Setup]   Delete MEC application instance profile   ${NON_EXISTING_APP_INSTANCE_ID}
     Request readiness status of MEC Application    ${NON_EXISTING_APP_INSTANCE_ID}   AppReadyConfirmation
     Check HTTP Response Status Code Is    404
 
@@ -85,7 +82,7 @@ Create a new MEC application instance profile
     Set Headers    {"Authorization":"${TOKEN}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    POST      http://${HOST_REG_APP}:${PORT_REG_APP}/${apiRoot_REG_APP}${apiName_REG_APP}/${apiVersion_REG_APP}/registrations    ${body}
+    Post      ${HOST_REG_APP}:${PORT_REG_APP}/${apiRoot_REG_APP}${apiName_REG_APP}/${apiVersion_REG_APP}/registrations    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable    ${APP_INSTANCE_ID}   ${response['body']['appInstanceId']}
@@ -98,7 +95,7 @@ Delete MEC application instance profile
     Set Headers    {"Content-Type":"application/json"}
     #Set Headers    {"Content-Type":"*/*"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Delete    http://${HOST_REG_APP}:${PORT_REG_APP}/${apiRoot_REG_APP}${apiName_REG_APP}/${apiVersion_REG_APP}/registrations/${app_instance_id}
+    Delete    ${HOST_REG_APP}:${PORT_REG_APP}/${apiRoot_REG_APP}${apiName_REG_APP}/${apiVersion_REG_APP}/registrations/${app_instance_id}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -109,7 +106,7 @@ Request termination of MEC Application
     Set Headers    {"Authorization":"${TOKEN}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/confirm_termination    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/confirm_termination    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -121,6 +118,6 @@ Request readiness status of MEC Application
     Set Headers    {"Authorization":"${TOKEN}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/confirm_ready    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/confirm_ready    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}

MEC011/SRV/CONFTASK/environment/variables_sandbox.txt

+*** Variables ***
+# Generic variables
+####Env variable for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                     try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  <your_id_from_sandbox>/mep1 
+${apiName}        mec_app_support
+${apiVersion}     v1
+
+${HOST_REG_APP}             try-mec.etsi.org
+${PORT_REG_APP}             443
+${apiRoot_REG_APP}          /sbxjbxjt4s/mep1 
+${apiName_REG_APP}          mec_app_support         
+${apiVersion_REG_APP}       v1
+
+
+# Specific variables
+#${APP_INSTANCE_ID}                       
+${APP_INSTANCE_ID}                      298b2c0c-7efa-45d3-8b47-8ab3c009b845
+${NON_EXISTING_APP_INSTANCE_ID}            NON_EXISTING_APP_INSTANCE_ID
\ No newline at end of file

MEC011/SRV/DNS/PlatDnsRules.robot

@@ -4,18 +4,15 @@ Documentation
 ...    A test suite for validating DNS rules (DNS) operations.
 
 Resource    ../../../GenericKeywords.robot
-Resource    environment/variables.txt
+#Resource    environment/variables.txt
+Resource    environment/variables_sandbox.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
 
 Default Tags    TC_MEC_SRV_DNS
 
 
-*** Variables ***
-
-
 *** Test Cases ***
-
 TC_MEC_MEC011_SRV_DNS_001_OK
     [Documentation]
     ...    Check that the IUT responds with a list of active DNS rules
@@ -40,7 +37,7 @@ TC_MEC_MEC011_SRV_DNS_001_NF
     ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
     ...               "ETSI GS MEC 011 3.2.1, clause 7.2.9.3.1"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
-    [Teardown]   Delete MEC application instance profile   ${NOT_EXISTENT_APP_INSTANCE_ID}
+    [Setup]   Delete MEC application instance profile   ${NOT_EXISTENT_APP_INSTANCE_ID}
     Get list of active DNS rules    ${NOT_EXISTENT_APP_INSTANCE_ID}
     Check HTTP Response Status Code Is    404
     
@@ -57,7 +54,6 @@ TC_MEC_MEC011_SRV_DNS_002_OK
     ...               "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile  AppInfo       
-    
     Get individual DNS rule    ${APP_INSTANCE_ID}    ${DNS_RULE_ID}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    DnsRule
@@ -74,7 +70,6 @@ TC_MEC_MEC011_SRV_DNS_002_NF
     ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
     ...               "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
-    
     Get individual DNS rule    ${APP_INSTANCE_ID}    ${NON_ESISTENT_DNS_RULE_ID}
     Check HTTP Response Status Code Is    404
 
@@ -86,7 +81,7 @@ TC_MEC_MEC011_SRV_DNS_003_OK
     ...
     ...    Reference "ETSI GS MEC 011 3.2.1, clause 5.2.8",
     ...              "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
-    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
+    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.2"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile  AppInfo       
     Update a DNS Rule    ${APP_INSTANCE_ID}    ${DNS_RULE_ID}    DnsRuleUpdate
@@ -104,7 +99,7 @@ TC_MEC_MEC011_SRV_DNS_003_BR
     ...
     ...    Reference "ETSI GS MEC 011 3.2.1, clause 5.2.8",
     ...              "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
-    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
+    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.2"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile  AppInfo       
@@ -120,7 +115,7 @@ TC_MEC_MEC011_SRV_DNS_003_NF
     ...
     ...    Reference "ETSI GS MEC 011 3.2.1, clause 5.2.8",
     ...              "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
-    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
+    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.2"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile  AppInfo       
@@ -137,7 +132,7 @@ TC_MEC_MEC011_SRV_DNS_003_PF
     ...
     ...    Reference "ETSI GS MEC 011 3.2.1, clause 5.2.8",
     ...              "ETSI GS MEC 011 3.2.1, clause 7.1.2.3",
-    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.1"
+    ...              "ETSI GS MEC 011 3.2.1, clause 7.2.10.3.2"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile  AppInfo       
     Update a DNS Rule with invalid etag    ${APP_INSTANCE_ID}    ${DNS_RULE_ID}    DnsRuleUpdate
@@ -200,7 +195,7 @@ Update a DNS Rule
     Set Headers    {"If-Match": "${VALID_ETAG}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/dns_rules/${dnsRuleId}    ${body}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/dns_rules/${dnsRuleId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -213,6 +208,6 @@ Update a DNS Rule with invalid etag
     Set Headers    {"If-Match": "${INVALID_ETAG}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/dns_rules/${dnsRuleId}    ${body}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/applications/${appInstanceId}/dns_rules/${dnsRuleId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file

MEC011/SRV/DNS/environment/variables_sandbox.txt

+*** Variables ***
+
+#### Env variable for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                     try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  /<id_provided_by_sandbox>/mep1 
+${apiName}        mec_app_support
+${apiVersion}     v1
+${APP_INSTANCE_ID}                      f1e4d448-e277-496b-bf63-98391cfd20fb
+
+# Specific variables
+${HOST_REG_APP}             127.0.0.1
+${PORT_REG_APP}             8082
+${apiRoot_REG_APP}          
+${apiName_REG_APP}          mec_app_support         
+${apiVersion_REG_APP}       v2
+${response}                         {}
+
+
+
+
+#${APP_INSTANCE_ID}                       5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+${NOT_EXISTENT_APP_INSTANCE_ID}          NOT_EXISTENT_APP_INSTANCE_ID
+${DNS_RULE_ID}                           e0deee2b-6e50-4f33-ab09-8bf0585025d3
+${NON_ESISTENT_DNS_RULE_ID}              NON_ESISTENT_DNS_RULE_ID
+${INVALID_ETAG}                          INVALID_ETAG
+${VALID_ETAG}                            abcdef
+
+${SOME_IP_ADDRESS}                   146.241.7.3
+
+# ${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
+
+# # 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

MEC011/SRV/MLS/Liveness.robot

@@ -4,7 +4,7 @@ Documentation
 ...    A test suite for validating MEC Liveness Service (MLS) operations.
 
 Resource    ../../../GenericKeywords.robot
-Resource    environment/variables.txt
+Resource    environment/variables_sandbox.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem    
 
@@ -34,7 +34,7 @@ TC_MEC_MEC011_SRV_MSL_001_NF
     ...                 "ETSI GS MEC 011 3.2.1, clause 8.1.2.4",
     ...                 "ETSI GS MEC 011 3.2.1, clause 8.2.10.3.1"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
-    Individual MEC service liveness  ${NOT_EXISING_URL_SERVICE_MEC_LIVENESS}
+    Individual MEC service liveness  ${NOT_EXISTING_URL_SERVICE_MEC_LIVENESS}
     Check HTTP Response Status Code Is    404
 
 
@@ -66,7 +66,6 @@ TC_MEC_MEC011_SRV_MSL_002_OK_02
     ...               "ETSI GS MEC 011 3.2.1, clause 8.2.10.3.3"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Set Headers    {"Authorization":"${TOKEN}"}
-    
     ${file}=    Catenate    SEPARATOR=    jsons/    ServiceLivenessUpdate    .json
     ${body}=    Get File    ${file}
     Update MEC service liveness  ${URL_SERVICE_MEC_LIVENESS}  ${body}
@@ -77,8 +76,8 @@ TC_MEC_MEC011_SRV_MSL_002_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    incorrect parameters were sent by a MEC Application
-    ...    Reference    "ETSI GS MEC 011 3.2.1, clause 8.1.2.5",
-    ...                 "ETSI GS MEC 011 3.2.1, clause 8.2.10.3.3",
+    ...    Reference    "ETSI GS MEC 011 3.2.1, clause 5.2.12",
+    ...                 "ETSI GS MEC 011 3.2.1, clause 8.1.2.5",
     ...                 "ETSI GS MEC 011 3.2.1, clause 8.2.10.3.3"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -89,6 +88,21 @@ TC_MEC_MEC011_SRV_MSL_002_BR
     Check HTTP Response Status Code Is    400
     
 
+TC_MEC_MEC011_SRV_MSL_002_NF
+    [Documentation]
+    ...    Check that the IUT responds with an error when 
+    ...    a request for an URI that cannot be mapped to a valid 
+    ...    resource URI is sent by a MEC Application
+    ...    Reference    "ETSI GS MEC 011 3.2.1, clause 5.2.12",
+    ...                 "ETSI GS MEC 011 3.2.1, clause 8.1.2.5",
+    ...                 "ETSI GS MEC 011 3.2.1, clause 8.2.10.3.3"
+    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
+    Set Headers    {"Authorization":"${TOKEN}"}
+    ${file}=    Catenate    SEPARATOR=    jsons/    ServiceLivenessUpdateError    .json
+    ${body}=    Get File    ${file}
+    Update MEC service liveness  ${NOT_EXISTING_URL_SERVICE_MEC_LIVENESS}  ${body}
+    Check HTTP Response Status Code Is    404
+    
 *** Keywords ***
 Create new service
     [Arguments]    ${content}    ${appInstanceId}
@@ -98,7 +112,8 @@ Create new service
     Set Headers    {"Authorization":"${TOKEN}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    POST      http://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services    ${body}
+    POST      ${SCHEMA_APP_SAQ}://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services    ${body}
+    Log      ${SCHEMA_APP_SAQ}://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable     ${LIVENESS_URI}     ${response['body']['_links']['liveness']['href']}   
@@ -111,7 +126,7 @@ Remove individual service
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Set Headers    {"Content-Type":"*/*"}
-    DELETE    http://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services/${serviceName}
+    DELETE    ${SCHEMA_APP_SAQ}://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services/${serviceName}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     

MEC011/SRV/MLS/environment/variables.txt

@@ -9,10 +9,11 @@ ${apiRoot}
 
 # Specific variables
 ${URL_SERVICE_MEC_LIVENESS} 	/link/to/individual/mecServiceLiveness
-${NOT_EXISING_URL_SERVICE_MEC_LIVENESS} 	/not_existing_link/to/individual/mecServiceLiveness
+${NOT_EXISTING_URL_SERVICE_MEC_LIVENESS} 	/not_existing_link/to/individual/mecServiceLiveness
 
 
 #Variables for test setups and teardowns
+${SCHEMA_APP_SAQ}        http
 ${HOST_APP_SAQ}          127.0.0.1
 ${PORT_APP_SAQ}          8082
 ${apiRoot_APP_SAQ}   

MEC011/SRV/MLS/environment/variables_sandbox.txt

+*** Variables ***
+#### Env variable for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                     try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  /<id_provided_by_sandbox>/mep1 
+${apiName}        mec_app_support
+${apiVersion}     v1
+${APP_INSTANCE_ID}                      b8ae165a-a1e3-4d6c-86d9-52c59ad314b6
+
+${SCHEMA_APP_SAQ}        https
+${HOST_APP_SAQ}          try-mec.etsi.org
+${PORT_APP_SAQ}          443
+${apiRoot_APP_SAQ}   	sbxjbxjt4s/mep1/
+${apiName_APP_SAQ}      mec_service_mgmt
+${apiVersion_APP_SAQ}    v1
+${APP_INSTANCE_ID}       appInstanceId
+${SERVICE_NAME}
+
+####
+
+# Specific variables
+${URL_SERVICE_MEC_LIVENESS} 	/link/to/individual/mecServiceLiveness
+${NOT_EXISTING_URL_SERVICE_MEC_LIVENESS} 	/not_existing_link/to/individual/mecServiceLiveness
+
+
+#Variables for test setups and teardowns
+#${HOST_APP_SAQ}          127.0.0.1
+#${PORT_APP_SAQ}          8082
+#${apiRoot_APP_SAQ}   
+#${apiName_APP_SAQ}       mec_service_mgmt
+#${apiVersion_APP_SAQ}    v1
+#${APP_INSTANCE_ID}       appInstanceId
+#${SERVICE_NAME}

MEC011/SRV/MLS/jsons/ServiceInfo.json

@@ -3,6 +3,6 @@
 	"version": "0.1",
 	"state": "INACTIVE",
 	"serializer": "XML",
-	"serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD",
-	"transportId": "transportId"
+	"transportId": "transportId",
+	"livenessInterval":10
 }
\ No newline at end of file

MEC011/SRV/REGAPPS/RegApps.robot

@@ -5,6 +5,7 @@ Documentation
 
 Resource    ../../../GenericKeywords.robot
 Resource    environment/variables.txt
+#Resource    environment/variables_sandbox.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 
 Default Tags    TC_MEC_SRV_REGAPPS
@@ -17,8 +18,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_OK_01
     ...    Check that the IUT acknowledges the registration 
     ...    by a MEC Application to the MEC platform
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfo 
     Check HTTP Response Status Code Is    201
@@ -33,8 +35,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_OK_02
     ...    Check that the IUT acknowledges the registration 
     ...    by a MEC Application to the MEC platform
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfo2 
     ${APP_INSTANCE_ID_REQ}    Get value entry from JSON file   AppInfo2     appInstanceId
@@ -52,8 +55,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_OK_03
     ...    Check that the IUT acknowledges the registration 
     ...    by a MEC Application to the MEC platform
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfo3 
     ${APP_INSTANCE_ID_REQ}    Get value entry from JSON file   AppInfo3     appInstanceId
@@ -74,8 +78,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_01
     ...    Check that the IUT responds with an error message when the IUT received a registration with
     ...    missing fields from a MEC Application instantiated by the MEC platform
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR1 
     Check HTTP Response Status Code Is    400
@@ -86,8 +91,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_02
     ...    Check that the IUT responds with an error message 
     ...    when the IUT received by a MEC Application registration with missing endpoint
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR2 
     Check HTTP Response Status Code Is    400
@@ -98,8 +104,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_03
     ...    Check that the IUT responds with an error message when the IUT received by a 
     ...    MEC Application registration with unexpected appServiceRequired
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR3 
     Check HTTP Response Status Code Is    400
@@ -110,8 +117,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_04
     ...    Check that the IUT responds with an error message when the IUT received by a 
     ...    MEC Application registration with unexpected appServiceRequired
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
-
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR4
     Check HTTP Response Status Code Is    400
@@ -122,7 +130,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_05
     ...    Check that the IUT responds with an error message when the IUT received by a 
     ...    MEC Application registration with unexpected appFeatureRequired
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR5
@@ -134,7 +144,9 @@ TC_MEC_MEC011_SRV_REGAPPS_001_BR_06
     ...    Check that the IUT responds with an error message when the IUT received by a 
     ...    MEC Application registration with unexpected appFeatureOptional
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4
+    ...    Reference  "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.1.2.6"
+    ...               "ETSI GS MEC 011 3.2.1, clause 7.2.13.3.4"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     Create a new MEC application instance profile   AppInfoBR6
@@ -147,7 +159,9 @@ TC_MEC_MEC011_SRV_REGAPPS_002_OK
     ...    Check that the IUT responds with the AppInfo description
     ...     when queried by a MEC Application
     ...    
-    ...    ETSI GS MEC 011 3.2.1, clause 7.2.14.3.1
+    ...    Reference   "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...                "ETSI GS MEC 011 3.2.1, clause 7.1.2.6",
+    ...                "ETSI GS MEC 011 3.2.1, clause 7.2.14.3.1"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile   AppInfo 
@@ -163,7 +177,9 @@ TC_MEC_MEC011_SRV_REGAPPS_002_NF
     ...    Check that the IUT responds with an error 
     ...    when it receives a request for returning an AppInfo with a wrong ID
     ...    
-    ...    ETSI GS MEC 011 3.2.1, clause 7.2.14.3.1
+    ...    Reference   "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...                "ETSI GS MEC 011 3.2.1, clause 7.1.2.6",
+    ...                "ETSI GS MEC 011 3.2.1, clause 7.2.14.3.1"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Delete MEC application instance profile   ${NOT_EXISTING_APP_INSTANCE_ID}
@@ -177,7 +193,9 @@ TC_MEC_MEC011_SRV_REGAPPS_003_OK
     ...    Check that the IUT responds with 204 No Content 
     ...    when queried to update MEC Application registration
     ...
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.14.3.2
+    ...    Reference    "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...                 "ETSI GS MEC 011 3.2.1, clause 7.1.2.6",
+    ...                 "ETSI GS MEC 011 3.2.1, clause 7.2.14.3.2"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile   AppInfo 
@@ -207,7 +225,9 @@ TC_MEC_MEC011_SRV_REGAPPS_004_OK
     ...    Check that the IUT responds with 204 No Content
     ...    when queried to delete an existing MEC Application registration
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.14.3.5
+    ...    Reference        "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...                     "ETSI GS MEC 011 3.2.1, clause 7.1.2.6",
+    ...                     "ETSI GS MEC 011 3.2.1, clause 7.2.14.3.5"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create a new MEC application instance profile   AppInfo 
@@ -222,7 +242,9 @@ TC_MEC_MEC011_SRV_REGAPPS_004_NF
     ...    Check that the IUT responds with an error when queried to 
     ...    delete an unknown MEC Application registration
     ...    
-    ...    Reference  ETSI GS MEC 011 3.2.1, clause 7.2.14.3.5
+    ...    Reference        "ETSI GS MEC 011 3.2.1, clause 5.2.13",
+    ...                     "ETSI GS MEC 011 3.2.1, clause 7.1.2.6",
+    ...                     "ETSI GS MEC 011 3.2.1, clause 7.2.14.3.5"
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Delete MEC application instance profile   ${NOT_EXISTING_APP_INSTANCE_ID}

MEC011/SRV/REGAPPS/environment/variables.txt

@@ -2,7 +2,7 @@
 # Generic variables
 ${SCHEMA}                   http
 ${HOST}                     127.0.0.1
-${PORT}                     8081
+${PORT}                     8082
 ${response}                         {}
 ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
 ${apiRoot}        

MEC011/SRV/REGAPPS/environment/variables_sandbox.txt

+*** Variables ***
+# Generic variables
+#### Env variable for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                     try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  /<id_provided_by_sandbox>/mep1 
+${apiName}        mec_app_support
+${apiVersion}     v1
+${APP_INSTANCE_ID}                      f1e4d448-e277-496b-bf63-98391cfd20fb
+
+# Specific variables
+${APP_NAME}                 		appName
+#${APP_INSTANCE_ID}          		appInstanceId
+${NOT_EXISTING_APP_INSTANCE_ID} 	notExistingAppInstanceId
+${APPD_ID}                  		appDId
\ No newline at end of file

MEC011/SRV/SAQ/PlatServices.robot

@@ -4,14 +4,12 @@ Documentation
 ...    A test suite for validating Service Availability Query (SAQ) operations.
 
 Resource    ../../../GenericKeywords.robot
-Resource    environment/variables.txt
+Resource    environment/variables_sandbox.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem  
 
 Default Tags    TC_MEC_SRV_SAQ
 
-
-
 *** Test Cases ***
 TC_MEC_MEC011_SRV_SAQ_001_OK
     [Documentation]
@@ -24,11 +22,10 @@ TC_MEC_MEC011_SRV_SAQ_001_OK
 
     [Tags]    PIC_MEC_PLAT    PIC_SERVICES
     [Setup]   Create new service   ServiceInfo    ${APP_INSTANCE_ID}
-    ${SER_NAME}    Get value entry from JSON file   ServiceInfo     serName
     Get list of available MEC services
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ServiceInfoList
-    [TearDown]   Remove individual service    ${APP_INSTANCE_ID}   ${SER_NAME}
+    [TearDown]   Remove individual service    ${APP_INSTANCE_ID}   ${SERVICE_ID}
     
 
 TC_MEC_MEC011_SRV_SAQ_001_BR
@@ -88,17 +85,17 @@ Create new service
     Set Headers    {"Authorization":"${TOKEN}"}
     ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
     ${body}=    Get File    ${file}
-    POST      http://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services    ${body}
+    POST      ${SCHEMA_APP_SAQ}://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    Set Suite Variable     ${SERVICE_NAME}     ${response['body']['serName']}   
+    Set Suite Variable     ${SERVICE_ID}     ${response['body']['serInstanceId']}   
     
 Remove individual service
     [Arguments]    ${appInstanceId}    ${serviceName} 
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Set Headers    {"Content-Type":"*/*"}
-    DELETE    http://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services/${serviceName}
+    DELETE    ${SCHEMA_APP_SAQ}://${HOST_APP_SAQ}:${PORT_APP_SAQ}/${apiRoot_APP_SAQ}${apiName_APP_SAQ}/${apiVersion_APP_SAQ}/applications/${appInstanceId}/services/${serviceName}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -116,7 +113,7 @@ Get list of available MEC services
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Set Headers    {"Content-Type":"*/*"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/services
+    Get  ${apiRoot}/${apiName}/${apiVersion}/services
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     

MEC011/SRV/SAQ/environment/variables.txt

@@ -13,11 +13,7 @@ ${apiVersion}     v1
 ${INVALID_VALUE}                INVALID_VALUE
 ${SERVICE_ID}                   e0deee2b-6e50-4f33-ab09-8bf0585025d3
 ${NON_EXISTENT_SERVICE_ID}          NON_EXISTENT_SERVICE_ID
-
-
-
-
-
+${SER_NAME}
 
 ${APP_INSTANCE_ID}                  5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
 ${INSTANCE_ID}                      instance_id

MEC011/SRV/SAQ/environment/variables_sandbox.txt

+*** Variables ***
+#### Env variable< for the ETSI MEC Sandbox
+${SCHEMA}                   https
+${HOST}                    try-mec.etsi.org
+${PORT}                     443
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}		  /<id_provided_by_sandbox>/mep1 
+${apiName}        /mec_service_mgmt
+${apiVersion}     v1
+${APP_INSTANCE_ID}                      b8ae165a-a1e3-4d6c-86d9-52c59ad314b6
+${SER_NAME}
+
+
+#Variables for test setups and teardowns
+${SCHEMA_APP_SAQ}        https
+${HOST_APP_SAQ}          try-mec.etsi.org
+${PORT_APP_SAQ}          443
+${apiRoot_APP_SAQ}   	 sbxjbxjt4s/mep1/
+${apiName_APP_SAQ}       mec_service_mgmt
+${apiVersion_APP_SAQ}    v1
+${SERVICE_NAME}
+####
+
+
+
+# Specific variables
+${INVALID_VALUE}                INVALID_VALUE
+${SERVICE_ID}                   e0deee2b-6e50-4f33-ab09-8bf0585025d3
+${NON_EXISTENT_SERVICE_ID}          NON_EXISTENT_SERVICE_ID
+#${APP_INSTANCE_ID}                  5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+${INSTANCE_ID}                      instance_id
+${FAKE_INSTANCE_ID_VALUE}           5
+${NON_EXISTENT_APP_INSTANCE_ID}     NON_ESISTENT_APP_INSTANCE_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
+
+# # 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
+
+#Variables for test setups and teardowns
+#${HOST_APP_SAQ}          127.0.0.1
+#${PORT_APP_SAQ}          8082
+#${apiRoot_APP_SAQ}   
+#${apiName_APP_SAQ}       mec_service_mgmt
+#${apiVersion_APP_SAQ}    v1
+#${APP_INSTANCE_ID}       appInstanceId
+#${SERVICE_NAME}
\ No newline at end of file

MEC011/SRV/SAQ/jsons/ServiceInfo.json

@@ -3,6 +3,5 @@
 	"version": "0.1",
 	"state": "INACTIVE",
 	"serializer": "XML",
-	"serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD",
 	"transportId": "transportId"
 }
\ No newline at end of file