Review of SAQ TCs of MEC011v3.2.1

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