diff --git a/MEC011/SRV/APPSAQ/PlatAppServices.robot b/MEC011/SRV/APPSAQ/PlatAppServices.robot
index 8e4e3ac6df2cecbc7170498c9f097e70c118e1aa..9f31e11889fc4b75cce7d5eb5c3cd6980e374549 100644
--- a/MEC011/SRV/APPSAQ/PlatAppServices.robot
+++ b/MEC011/SRV/APPSAQ/PlatAppServices.robot
@@ -18,8 +18,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.6.3.1
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
+ ... Reference ETSI GS MEC 011 3.2.1, clause 5.2.5
+ ... Reference ETSI GS MEC 011 3.2.1, clause 8.1.2.2
+ ... Reference ETSI GS MEC 011 3.2.1, clause 8.2.6.3.1
[Tags] PIC_MEC_PLAT PIC_SERVICES
@@ -33,8 +34,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.6.3.1
-
+ ... Reference ETSI GS MEC 011 3.2.1, clause 5.2.5
+ ... Reference ETSI GS MEC 011 3.2.1, clause 8.1.2.2
+ ... Reference ETSI GS MEC 011 3.2.1, clause 8.2.6.3.1
[Tags] PIC_MEC_PLAT PIC_SERVICES
# Wrong query parameter name should trigger an error response.
@@ -47,8 +49,9 @@ TP_MEC_MEC011_SRV_APPSAQ_002_OK
... Check that the IUT notifies the authorised relevant (subscribed) application
... instances when a new service for a given application instance is registered
...
- ... Reference ETSI GS MEC 011 V2.2.1, clause 8.2.6.3.4
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.5",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.6.3.4"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Create new service ServiceInfo ${APP_INSTANCE_ID}
@@ -56,15 +59,16 @@ TP_MEC_MEC011_SRV_APPSAQ_002_OK
Check HTTP Response Body Json Schema Is ServiceInfo
Check HTTP Response Header Contains Location
Check Response Contains ${response['body']} serName ${NEW_SERVICE_NAME}
-
+
TP_MEC_MEC011_SRV_APPSAQ_002_BR
[Documentation]
... 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.2.1, clause 8.2.6.3.4
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.5",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.6.3.4"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Create new service ServiceInfoError ${APP_INSTANCE_ID}
@@ -76,7 +80,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.6.3.4
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.5",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.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
@@ -89,8 +95,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.7.3.1
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.5",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.1"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Get individual service ${APP_INSTANCE_ID} ${SERVICE_ID}
@@ -104,8 +111,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.7.3.1
-
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.5",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.1"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Get individual service ${APP_INSTANCE_ID} ${NON_EXISTENT_SERVICE_ID}
Check HTTP Response Status Code Is 404
@@ -116,9 +124,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.7.3.2
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
-
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.4",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.2"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Update service ${APP_INSTANCE_ID} ${SERVICE_ID} ServiceInfoUpdated
Check HTTP Response Status Code Is 200
@@ -131,9 +139,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.7.3.2
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
-
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.4",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.2"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Update service ${APP_INSTANCE_ID} ${SERVICE_ID} ServiceInfoUpdatedError
Check HTTP Response Status Code Is 400
@@ -144,9 +152,9 @@ TP_MEC_MEC011_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.2.1, clause 8.2.7.3.2
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
-
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 5.2.4",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.1.2.2",
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.2"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Update service ${APP_INSTANCE_ID} ${NON_EXISTENT_SERVICE_ID} ServiceInfoUpdated
Check HTTP Response Status Code Is 404
@@ -157,8 +165,7 @@ TP_MEC_MEC011_SRV_APPSAQ_005_OK
... 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.2.1, clause 8.2.7.3.5
- ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.5"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Remove individual service ${APP_INSTANCE_ID} ${SERVICE_ID}
@@ -170,7 +177,7 @@ TP_MEC_MEC011_SRV_APPSAQ_005_NF
... 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.2.1, clause 8.2.7.3.5
+ ... Reference "ETSI GS MEC 011 3.2.1, clause 8.2.7.3.5"
[Tags] PIC_MEC_PLAT PIC_SERVICES
Remove individual service ${APP_INSTANCE_ID} ${NON_EXISTENT_SERVICE_ID}
Check HTTP Response Status Code Is 404
diff --git a/MEC011/SRV/APPSAQ/environment/variables.txt b/MEC011/SRV/APPSAQ/environment/variables.txt
index e2331ca9e785aaff92b4c4f3777667ebde8c23f0..a2c53ef768c155ca9ae6a1ada6718a899621b820 100644
--- a/MEC011/SRV/APPSAQ/environment/variables.txt
+++ b/MEC011/SRV/APPSAQ/environment/variables.txt
@@ -13,7 +13,7 @@ ${apiVersion} v1
${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
+${NON_EXISTENT_APP_INSTANCE_ID} NON_EXISTENT_APP_INSTANCE_ID
${SERVICE_ID} e0deee2b-6e50-4f33-ab09-8bf0585025d3
${NON_EXISTENT_SERVICE_ID} NON_EXISTENT_SERVICE_ID
${INVALID_ETAG} INVALID_ETAG
diff --git a/MEC011/SRV/APPSAQ/jsons/ServiceInfo.json b/MEC011/SRV/APPSAQ/jsons/ServiceInfo.json
index a7962fa6d32db172133b8e046af8da749f929b04..1cc5adf0fdf9a457da473ac49f1422925478a5c0 100644
--- a/MEC011/SRV/APPSAQ/jsons/ServiceInfo.json
+++ b/MEC011/SRV/APPSAQ/jsons/ServiceInfo.json
@@ -1,42 +1,8 @@
{
- "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
+ "serName": "serviceName",
+ "version": "0.1",
+ "state": "INACTIVE",
+ "serializer": "XML",
+ "serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD",
+ "transportId": "transportId"
}
\ No newline at end of file
diff --git a/MEC011/SRV/APPSAQ/jsons/ServiceInfoError.json b/MEC011/SRV/APPSAQ/jsons/ServiceInfoError.json
index 672c8a05db8746bbfdd23b2f9888be7cc938034f..148a2fbefe54322a40e859441e0a2a8f11fcbb78 100644
--- a/MEC011/SRV/APPSAQ/jsons/ServiceInfoError.json
+++ b/MEC011/SRV/APPSAQ/jsons/ServiceInfoError.json
@@ -1,42 +1,8 @@
{
- "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
+ "Name": "WRONG_PARAM_NAME",
+ "version": "0.1",
+ "state": "INACTIVE",
+ "serializer": "XML",
+ "serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD",
+ "transportId": "transportId"
}
\ No newline at end of file
diff --git a/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdated.json b/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdated.json
index afee85ac9419054136e278c60f5ae34d1706a1f5..f64e4817e20c1eafeb5384c7002ac82780570212 100644
--- a/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdated.json
+++ b/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdated.json
@@ -1,42 +1,7 @@
{
- "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
+ "serName": "NEW_SERVICE_NAME",
+ "version": "0.1",
+ "state": "INACTIVE",
+ "serializer": "XML",
+ "serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD"
}
\ No newline at end of file
diff --git a/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdatedError.json b/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdatedError.json
index 6794471ccde6e94aa98b95ad8f9aa9fb35e30ab3..44b501601ec34985c042df4162d6cee7181ef3f7 100644
--- a/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdatedError.json
+++ b/MEC011/SRV/APPSAQ/jsons/ServiceInfoUpdatedError.json
@@ -1,42 +1,7 @@
{
- "serName": "NEW_SERVICE_NAME",
- "a_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
+ "serName": "NEW_SERVICE_NAME",
+ "a_version": "v2.0",
+ "state": "INACTIVE",
+ "serializer": "XML",
+ "serInstanceId": "3F897E85-ABCD-FFFF-A957-FCF0CCE649FD"
}
\ No newline at end of file