Commit e4b9a76c authored by Elian Kraja's avatar Elian Kraja

Fixing issues #20 and #21

parent 2e22c48e
Pipeline #3737 passed with stage
in 0 seconds
...@@ -23,12 +23,21 @@ Check HTTP Response Body Json Schema Is ...@@ -23,12 +23,21 @@ Check HTTP Response Body Json Schema Is
Should Be Present In Json List Should Be Present In Json List
[Arguments] ${expr} ${json_field} ${json_value} [Arguments] ${expr} ${json_field} ${json_value}
Log Check if ${json_field} is present in ${expr} with the value ${jsonvalue} Log Check if ${json_field} is present in ${expr} with the value ${json_value}
:FOR ${item} IN @{expr} :FOR ${item} IN @{expr}
\ Exit For Loop If "${item['${json_field}']}" == "${json_value}" \ Exit For Loop If "${item['${json_field}']}" == "${json_value}"
Log Item found ${item} Log Item found ${item}
[return] ${item} [return] ${item}
Should Be Present In Json
[Arguments] ${expr} ${json_field} ${json_value}
Log Check if ${json_field} is present in ${expr} with the value ${json_value}
Should Be Equal As Strings ${expr}['${json_field}'] ${json_value}
Check Response Contains
[Arguments] ${source} ${parameter} ${value}
Should Be Present In Json ${source} ${parameter} ${value}
Check Result Contains Check Result Contains
[Arguments] ${source} ${parameter} ${value} [Arguments] ${source} ${parameter} ${value}
Should Be Present In Json List ${source} ${parameter} ${value} Should Be Present In Json List ${source} ${parameter} ${value}
......
...@@ -47,7 +47,7 @@ TC_MEC_SRV_APPSAQ_002_OK ...@@ -47,7 +47,7 @@ TC_MEC_SRV_APPSAQ_002_OK
... Check that the IUT notifies the authorised relevant (subscribed) application ... Check that the IUT notifies the authorised relevant (subscribed) application
... instances when a new service for a given application instance is registered ... 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 ... 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 ... OpenAPI https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#/definitions/ServiceInfo
[Tags] PIC_MEC_PLAT PIC_SERVICES [Tags] PIC_MEC_PLAT PIC_SERVICES
...@@ -55,7 +55,7 @@ TC_MEC_SRV_APPSAQ_002_OK ...@@ -55,7 +55,7 @@ TC_MEC_SRV_APPSAQ_002_OK
Check HTTP Response Status Code Is 201 Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is ServiceInfo Check HTTP Response Body Json Schema Is ServiceInfo
Check HTTP Response Header Contains Location Check HTTP Response Header Contains Location
Check Result Contains ${response['body']} serName ${NEW_SERVICE_NAME} Check Response Contains ${response['body']} serName ${NEW_SERVICE_NAME}
TC_MEC_SRV_APPSAQ_002_BR TC_MEC_SRV_APPSAQ_002_BR
...@@ -96,7 +96,7 @@ TC_MEC_SRV_APPSAQ_003_OK ...@@ -96,7 +96,7 @@ TC_MEC_SRV_APPSAQ_003_OK
Get individual service ${APP_INSTANCE_ID} ${SERVICE_ID} Get individual service ${APP_INSTANCE_ID} ${SERVICE_ID}
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is ServiceInfo Check HTTP Response Body Json Schema Is ServiceInfo
Check Result Contains ${response['body']} serInstanceId ${SERVICE_ID} Check Response Contains ${response['body']} serInstanceId ${SERVICE_ID}
TC_MEC_SRV_APPSAQ_003_NF TC_MEC_SRV_APPSAQ_003_NF
...@@ -123,7 +123,7 @@ TC_MEC_SRV_APPSAQ_004_OK ...@@ -123,7 +123,7 @@ TC_MEC_SRV_APPSAQ_004_OK
Update service ${APP_INSTANCE_ID} ${SERVICE_ID} ServiceInfoUpdated Update service ${APP_INSTANCE_ID} ${SERVICE_ID} ServiceInfoUpdated
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is ServiceInfo Check HTTP Response Body Json Schema Is ServiceInfo
Check Result Contains ${response['body']} version ${SVC_NEW_VERSION} Check Response Contains ${response['body']} version ${SVC_NEW_VERSION}
TC_MEC_SRV_APPSAQ_004_BR TC_MEC_SRV_APPSAQ_004_BR
......
...@@ -52,8 +52,8 @@ TC_MEC_SRV_APPSUB_002_OK ...@@ -52,8 +52,8 @@ TC_MEC_SRV_APPSUB_002_OK
Check HTTP Response Status Code Is 201 Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is AppTerminationNotificationSubscription Check HTTP Response Body Json Schema Is AppTerminationNotificationSubscription
Check HTTP Response Header Contains Location Check HTTP Response Header Contains Location
Check Result Contains ${response['body']} subscriptionType "AppTerminationNotificationSubscription" Check Response Contains ${response['body']} subscriptionType AppTerminationNotificationSubscription
Check Result Contains ${response['body']} callbackReference ${APP_TERM_NOTIF_CALLBACK_URI} Check Response Contains ${response['body']} callbackReference ${APP_TERM_NOTIF_CALLBACK_URI}
TC_MEC_SRV_APPSUB_003_OK TC_MEC_SRV_APPSUB_003_OK
...@@ -68,7 +68,7 @@ TC_MEC_SRV_APPSUB_003_OK ...@@ -68,7 +68,7 @@ TC_MEC_SRV_APPSUB_003_OK
Get individual subscription ${APP_INSTANCE_ID} ${SUBSCRIPTION_ID} Get individual subscription ${APP_INSTANCE_ID} ${SUBSCRIPTION_ID}
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is AppTerminationNotificationSubscription Check HTTP Response Body Json Schema Is AppTerminationNotificationSubscription
Check Result Contains ${response['body']} subscriptionType "AppTerminationNotificationSubscription" Check Response Contains ${response['body']} subscriptionType AppTerminationNotificationSubscription
TC_MEC_SRV_APPSUB_003_NF TC_MEC_SRV_APPSUB_003_NF
......
...@@ -52,7 +52,7 @@ TC_MEC_SRV_SAQ_002_OK ...@@ -52,7 +52,7 @@ TC_MEC_SRV_SAQ_002_OK
Get specific MEC service ${SERVICE_ID} Get specific MEC service ${SERVICE_ID}
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is ServiceInfo Check HTTP Response Body Json Schema Is ServiceInfo
Check Result Contains ${response['body']} serInstanceId ${SERVICE_ID} Check Response Contains ${response['body']} serInstanceId ${SERVICE_ID}
TC_MEC_SRV_SAQ_002_NF TC_MEC_SRV_SAQ_002_NF
......
...@@ -52,8 +52,8 @@ TC_MEC_SRV_SRVSUB_002_OK ...@@ -52,8 +52,8 @@ TC_MEC_SRV_SRVSUB_002_OK
Check HTTP Response Status Code Is 201 Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is SerAvailabilityNotificationSubscription Check HTTP Response Body Json Schema Is SerAvailabilityNotificationSubscription
Check HTTP Response Header Contains Location Check HTTP Response Header Contains Location
Check Result Contains ${response['body']} subscriptionType "SerAvailabilityNotificationSubscription" Check Response Contains ${response['body']} subscriptionType "SerAvailabilityNotificationSubscription"
Check Result Contains ${response['body']} callbackReference ${APP_SRVSUB_NOTIF_CALLBACK_URI} Check Response Contains ${response['body']} callbackReference ${APP_SRVSUB_NOTIF_CALLBACK_URI}
TC_MEC_SRV_SRVSUB_002_BR TC_MEC_SRV_SRVSUB_002_BR
...@@ -81,7 +81,7 @@ TC_MEC_SRV_SRVSUB_003_OK ...@@ -81,7 +81,7 @@ TC_MEC_SRV_SRVSUB_003_OK
Get individual subscription ${APP_INSTANCE_ID} ${SUBSCRIPTION_ID} Get individual subscription ${APP_INSTANCE_ID} ${SUBSCRIPTION_ID}
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is SerAvailabilityNotificationSubscription Check HTTP Response Body Json Schema Is SerAvailabilityNotificationSubscription
Check Result Contains ${response['body']} subscriptionType "SerAvailabilityNotificationSubscription" Check Response Contains ${response['body']} subscriptionType SerAvailabilityNotificationSubscription
TC_MEC_SRV_SRVSUB_003_NF TC_MEC_SRV_SRVSUB_003_NF
......
...@@ -51,7 +51,7 @@ TC_MEC_SRV_TRAF_002_OK ...@@ -51,7 +51,7 @@ TC_MEC_SRV_TRAF_002_OK
Get individual traffic rule ${APP_INSTANCE_ID} ${TRAFFIC_RULE_ID} Get individual traffic rule ${APP_INSTANCE_ID} ${TRAFFIC_RULE_ID}
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is TrafficRule Check HTTP Response Body Json Schema Is TrafficRule
Check Result Contains ${response['body']} trafficRuleId ${TRAFFIC_RULE_ID} Check Response Contains ${response['body']} trafficRuleId ${TRAFFIC_RULE_ID}
TC_MEC_SRV_TRAF_003_OK TC_MEC_SRV_TRAF_003_OK
...@@ -66,8 +66,8 @@ TC_MEC_SRV_TRAF_003_OK ...@@ -66,8 +66,8 @@ TC_MEC_SRV_TRAF_003_OK
Update a traffic rule ${APP_INSTANCE_ID} ${TRAFFIC_RULE_ID} TrafficRuleUpdate Update a traffic rule ${APP_INSTANCE_ID} ${TRAFFIC_RULE_ID} TrafficRuleUpdate
Check HTTP Response Status Code Is 200 Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is TrafficRule Check HTTP Response Body Json Schema Is TrafficRule
Check Result Contains ${response['body']} trafficRuleId ${TRAFFIC_RULE_ID} Check Response Contains ${response['body']} trafficRuleId ${TRAFFIC_RULE_ID}
Check Result Contains ${response['body']} action "DROP" Check Response Contains ${response['body']} action DROP
TC_MEC_SRV_TRAF_003_BR TC_MEC_SRV_TRAF_003_BR
......
{ {
"type": "object", "type": "object",
"properties": { "properties": {
"userInfo": { "accessPointId": {
"type": "object", "description": "The identity of the access point the user is currently on, see note 1.",
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String"
},
"address": {
"description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.",
"format": "uri",
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "AnyURI"
},
"ancillaryInfo": {
"description": "Reserved for future use.",
"type": "string",
"x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "String"
},
"contextLocationInfo": {
"description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).",
"type": "string",
"x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "String"
},
"locationInfo": {
"properties": { "properties": {
"accessPointId": { "accuracy": {
"description": "The identity of the access point the user is currently on, see note 1.", "type": "number"
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String"
}, },
"address": { "accuracyAltitude": {
"description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.", "type": "number"
"format": "uri",
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "AnyURI"
}, },
"ancillaryInfo": { "accuracySemiMinor": {
"description": "Reserved for future use.", "type": "number"
"type": "string",
"x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "String"
}, },
"contextLocationInfo": { "altitude": {
"description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).", "description": "Location altitude relative to the WGS84 ellipsoid surface.",
"type": "string", "type": "number",
"x-etsi-mec-cardinality": "0..1", "x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "String" "x-etsi-mec-origin-type": "Float"
},
"confidence": {
"type": "number"
},
"includedAngle": {
"type": "number"
},
"innerRadius": {
"type": "number"
}, },
"locationInfo": { "latitude": {
"properties": { "description": "Location latitude, expressed in the range -90 to +90. Cardinality greater than one only if \"shape\" equals 7.",
"accuracy": { "items": {
"type": "number" "type": "number"
},
"accuracyAltitude": {
"type": "number"
},
"accuracySemiMinor": {
"type": "number"
},
"altitude": {
"description": "Location altitude relative to the WGS84 ellipsoid surface.",
"type": "number",
"x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "Float"
},
"confidence": {
"type": "number"
},
"includedAngle": {
"type": "number"
},
"innerRadius": {
"type": "number"
},
"latitude": {
"description": "Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7.",
"items": {
"type": "number"
},
"type": "array",
"x-etsi-mec-cardinality": "1..N",
"x-etsi-mec-origin-type": "Float"
},
"longitude": {
"description": "Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7.",
"items": {
"type": "number"
},
"type": "array",
"x-etsi-mec-cardinality": "1..N",
"x-etsi-mec-origin-type": "Float"
},
"offsetAngle": {
"type": "number"
},
"orientationMajorAxis": {
"type": "number"
},
"shape": {
"description": "Shape information, as detailed in [14], associated with the reported location coordinate:\n1 = Ellipsoid_Arc\n2 = ellipsoid_Point\n3 = ellipsoid_Point_Altitude\n4 = ellipsoid_Point_Altitude_Uncert_Ellipsoid\n5 = ellipsoid_Point_Uncert_Circle\n6 = ellipsoid_Point_Uncert_Ellipse\n7 = polygon",
"enum": [
"ELLIPSOID_ARC",
"ELLIPSOID_POINT",
"ELLIPSOID_POINT_ALTITUDE",
"ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID",
"ELLIPSOID_POINT_UNCERT_CIRCLE",
"ELLIPSOID_POINT_UNCERT_ELLIPSE",
"POLYGON"
],
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "Enum (inlined)"
},
"uncertaintyRadius": {
"type": "number"
},
"velocity": {
"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
"type": "object",
"x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "Structure (inlined)"
}
}, },
"required": [ "minItems": 1,
"latitude", "type": "array",
"longitude", "x-etsi-mec-cardinality": "1..N",
"shape" "x-etsi-mec-origin-type": "Float"
], },
"type": "object", "longitude": {
"x-etsi-ref": "6.5.3" "description": "Location longitude, expressed in the range -180 to +180. Cardinality greater than one only if \"shape\" equals 7.",
"items": {
"type": "number"
},
"minItems": 1,
"type": "array",
"x-etsi-mec-cardinality": "1..N",
"x-etsi-mec-origin-type": "Float"
}, },
"resourceURL": { "offsetAngle": {
"description": "Self-referring URL, see note 1.", "type": "number"
},
"orientationMajorAxis": {
"type": "number"
},
"shape": {
"description": "Shape information, as detailed in [14], associated with the reported location coordinate:\n1 = Ellipsoid_Arc\n2 = ellipsoid_Point\n3 = ellipsoid_Point_Altitude\n4 = ellipsoid_Point_Altitude_Uncert_Ellipsoid\n5 = ellipsoid_Point_Uncert_Circle\n6 = ellipsoid_Point_Uncert_Ellipse\n7 = polygon",
"type": "string", "type": "string",
"x-etsi-mec-cardinality": "1", "x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String" "x-etsi-mec-origin-type": "Enum_inlined"
}, },
"timeStamp": { "uncertaintyRadius": {
"properties": { "type": "number"
"nanoSeconds": { },
"type": "number" "velocity": {
}, "description": "Structure with attributes relating to the target entitys velocity, as defined in [14].",
"seconds": {
"type": "number"
}
},
"required": [
"seconds",
"nanoSeconds"
],
"type": "object", "type": "object",
"x-etsi-ref": "6.5.2" "x-etsi-mec-cardinality": "0..1",
"x-etsi-mec-origin-type": "Structure (inlined)"
}
},
"required": [
"latitude",
"longitude",
"shape"
],
"type": "object",
"x-etsi-ref": "6.5.3"
},
"resourceURL": {
"description": "Self-referring URL, see note 1.",
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String"
},
"timeStamp": {
"properties": {
"nanoSeconds": {
"type": "number"
}, },
"zoneId": { "seconds": {
"description": "The identity of the zone the user is currently within, see note 1.", "type": "number"
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String"
} }
}, },
"required": [ "required": [
"address", "seconds",
"accessPointId", "nanoSeconds"
"zoneId",
"resourceURL",
"timeStamp"
], ],
"x-etsi-notes": ":\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.", "type": "object",
"x-etsi-ref": "6.2.2" "x-etsi-ref": "6.5.2"
},
"zoneId": {
"description": "The identity of the zone the user is currently within, see note 1.",
"type": "string",
"x-etsi-mec-cardinality": "1",
"x-etsi-mec-origin-type": "String"
} }
} },
} "required": [
"address",
"accessPointId",
"zoneId",
"resourceURL",
"timeStamp"
],
"description": "Represents the information related to a user attached to an access point associated to the MEC host, such access point is in scope of the Location Service instance.\n",
"x-etsi-notes": ":\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.",
"x-etsi-ref": "6.2.2"
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment