Commit f96c2247 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix on UE Location Lookup

parents 4ab4dd45 21351e11
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ Check HTTP Response Status Code Is
    Log    Status code validated
    Log    Status code validated


Check HTTP Response Body Json Schema Is
Check HTTP Response Body Json Schema Is
    [Tags]    INCLUDE_UNDEFINED_SCHEMAS
    [Arguments]    ${input}
    [Arguments]    ${input}
    Should Contain    ${response['headers']['Content-Type']}    application/json
    Should Contain    ${response['headers']['Content-Type']}    application/json
    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
+2 −2
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ TC_MEC_SRV_RLOCLOOK_001_OK
    Get the access points list        ${ZONE_ID}
    Get the access points list        ${ZONE_ID}
    Check HTTP Response Status Code Is    200
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    AccessPointList
    Check HTTP Response Body Json Schema Is    AccessPointList
    Check Result Contains    ${response['body']['accessPointList']}    zoneId    ${ZONE_ID}
    Should Be Equal As Strings    ${response['body']['accessPointList']['zoneId']}	${ZONE_ID}




TC_MEC_SRV_RLOCLOOK_001_NF
TC_MEC_SRV_RLOCLOOK_001_NF
+9 −122
Original line number Original line Diff line number Diff line
{
{
	"description": "A type containing list of access points.",
	"type": "object",
	"required": [
		"zoneId",
		"resourceURL"
	],
	"properties": {
		"zoneId": {
			"description": "Identifier of zone",
			"type": "string",
			"example": "zone01"
		},
		"accessPoint": {
			"description": "Collection of the access point information list.",
			"type": "array",
			"items": {
				"description": "A type containing access point information.",
				"type": "object",
				"required": [
					"accessPointId",
					"connectionType",
					"operationStatus",
					"numberOfUsers",
					"resourceURL"
				],
  "properties": {
  "properties": {
					"accessPointId": {
    "undefinedJsonSchema": {
						"description": "Identifier of access point, <E-CGI><Cell Portion ID> (reference ETSI TS 129 171). Where the E-CGI is made up of the PLMN and Cell Identity (28 bit string). Then the PLMN is made up of the 3 digit MCC & 2 or 3 digit MNC. The Cell Portion is an optional element",
						"type": "string",
						"example": "001010000000000000000000000000001"
					},
					"locationInfo": {
						"description": "A type containing location information with latitude, longitude and altitude, in addition the accuracy of the information are provided.",
						"type": "object",
						"required": [
							"latitude",
							"longitude",
							"accuracy"
						],
						"properties": {
							"latitude": {
								"type": "number",
								"format": "float",
								"example": "80.123"
							},
							"longitude": {
								"type": "number",
								"format": "float",
								"example": "70.123"
							},
							"altitude": {
								"type": "number",
								"format": "float",
								"example": "10.0"
							},
							"accuracy": {
								"type": "integer",
								"format": "int32",
								"example": "10"
							}
						}
					},
					"connectionType": {
						"description": "The connection type for the access point",
      "type": "string",
      "type": "string",
						"enum": [
      "description": "Json Schema for the given object is not yet defined"
							"Femto",
							"LTE-femto",
							"Smallcell",
							"LTE-smallcell",
							"Wifi",
							"Pico",
							"Micro",
							"Macro",
							"Wimax",
							"Unknown"
						],
						"example": "Macro"
					},
					"operationStatus": {
						"description": "The operation status of the access point",
						"type": "string",
						"enum": [
							"Serviceable",
							"Unserviceable",
							"Unknown"
						],
						"example": "Serviceable"
					},
					"numberOfUsers": {
						"description": "The number of users currently on the access point.",
						"type": "integer",
						"format": "uint32",
						"example": "7"
					},
					"timezone": {
						"description": "Time zone of access point",
						"type": "string",
						"format": "date-time",
						"example": "2017-01-01T02:51:43Z"
					},
					"interestRealm": {
						"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
						"type": "string",
						"example": "LA"
					},
					"resourceURL": {
						"description": "Self referring URL.",
						"type": "string",
						"format": "uri",
						"example": "http://example.com/exampleAPI/location/v1/subscriptions/userTracking/subscription123"
					}
				}
    }
    }
  },
  },
		"resourceURL": {
  "required": [
			"description": "Self referring URL.",
    "undefinedJsonSchema"
			"type": "string",
  ]
			"format": "uri",
			"example": "http://example.com/exampleAPI/location/v1/subscriptions/userTracking/subscription123"
		}
	}
}
}
 No newline at end of file
+2 −3
Original line number Original line Diff line number Diff line
@@ -26,9 +26,8 @@ TC_MEC_SRV_UEAREASUB_001_OK
    Create new subscription    CircleNotificationSubscription
    Create new subscription    CircleNotificationSubscription
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
    Check HTTP Response Body Json Schema Is    CircleNotificationSubscription
    Check HTTP Response Body Json Schema Is    CircleNotificationSubscription
    Check Result Contains    ${response['body']['circleNotificationSubscription']}    clientCorrelator    ${UEAREASUB_CLIENT_ID} 
    Should Be Equal As Strings    ${response['body']['circleNotificationSubscription']['callbackReference']}        ${APP_UEAREASUB_CALLBACK_URI}
    Check Result Contains    ${response['body']['circleNotificationSubscription']}    callbackReference    ${APP_UEAREASUB_CALLBACK_URI}
    Should Be Equal As Strings    ${response['body']['circleNotificationSubscription']['address']}    ${IP_ADDRESS}
    Check Result Contains    ${response['body']['circleNotificationSubscription']}    address    ${IP_ADDRESS}
    
    




+6 −137
Original line number Original line Diff line number Diff line
{
{
  "definitions": {},
  "$schema": "http://json-schema.org/draft-07/schema#",
  "$id": "http://example.com/root.json",
  "type": "object",
  "title": "The Root Schema",
  "required": [
    "address",
    "callbackReference",
    "checkImmediate",
    "clientCorrelator",
    "enteringLeavingCriteria",
    "frequency",
    "latitude",
    "longitude",
    "radius",
    "trackingAccuracy"
  ],
  "properties": {
  "properties": {
    "address": {
    "undefinedJsonSchema": {
      "$id": "#/properties/address",
      "type": "string",
      "title": "The Address Schema",
      "default": "",
      "examples": [
        "acr:10.0.0.1"
      ],
      "pattern": "^(.*)$"
    },
    "callbackReference": {
      "$id": "#/properties/callbackReference",
      "type": "object",
      "title": "The Callbackreference Schema",
      "required": [
        "callbackData",
        "notifyURL"
      ],
      "properties": {
        "callbackData": {
          "$id": "#/properties/callbackReference/properties/callbackData",
          "type": "string",
          "title": "The Callbackdata Schema",
          "default": "",
          "examples": [
            "1234"
          ],
          "pattern": "^(.*)$"
        },
        "notifyURL": {
          "$id": "#/properties/callbackReference/properties/notifyURL",
      "type": "string",
      "type": "string",
          "title": "The Notifyurl Schema",
      "description": "Json Schema for the given object is not yet defined"
          "default": "",
          "examples": [
            "http://application.example.com/notifications/distance_notifications/123456"
          ],
          "pattern": "^(.*)$"
    }
    }
      }
    },
    "checkImmediate": {
      "$id": "#/properties/checkImmediate",
      "type": "string",
      "title": "The Checkimmediate Schema",
      "default": "",
      "examples": [
        "true"
      ],
      "pattern": "^(.*)$"
    },
    "clientCorrelator": {
      "$id": "#/properties/clientCorrelator",
      "type": "string",
      "title": "The Clientcorrelator Schema",
      "default": "",
      "examples": [
        "0123"
      ],
      "pattern": "^(.*)$"
    },
    "enteringLeavingCriteria": {
      "$id": "#/properties/enteringLeavingCriteria",
      "type": "string",
      "title": "The Enteringleavingcriteria Schema",
      "default": "",
      "examples": [
        "Entering"
      ],
      "pattern": "^(.*)$"
    },
    "frequency": {
      "$id": "#/properties/frequency",
      "type": "string",
      "title": "The Frequency Schema",
      "default": "",
      "examples": [
        "10"
      ],
      "pattern": "^(.*)$"
    },
    "latitude": {
      "$id": "#/properties/latitude",
      "type": "string",
      "title": "The Latitude Schema",
      "default": "",
      "examples": [
        "-80.86302"
      ],
      "pattern": "^(.*)$"
    },
    "longitude": {
      "$id": "#/properties/longitude",
      "type": "string",
      "title": "The Longitude Schema",
      "default": "",
      "examples": [
        "41.277306"
      ],
      "pattern": "^(.*)$"
  },
  },
    "radius": {
  "required": [
      "$id": "#/properties/radius",
    "undefinedJsonSchema"
      "type": "string",
  ]
      "title": "The Radius Schema",
      "default": "",
      "examples": [
        "500"
      ],
      "pattern": "^(.*)$"
    },
    "trackingAccuracy": {
      "$id": "#/properties/trackingAccuracy",
      "type": "string",
      "title": "The Trackingaccuracy Schema",
      "default": "",
      "examples": [
        "10"
      ],
      "pattern": "^(.*)$"
    }
  }
}
}
 No newline at end of file
Loading