Completed Location typing

ttcn/AtsMec/AtsMec_TestControl.ttcn

@@ -25,7 +25,7 @@ module AtsMec_TestControl {
       if (PICS_UE_IDENTITY_API_SUPPORTED) {
         execute(TC_MEC_PLAT_MP1_UETAG_BV_001());
         execute(TC_MEC_PLAT_MP1_UETAG_BV_002());
-        //execute(TC_MEC_PLAT_MP1_UETAG_BV_003());
+        execute(TC_MEC_PLAT_MP1_UETAG_BV_003());
       }
       if (PICS_LOCATION_API_SUPPORTED) {
         execute(TC_MEC_PLAT_MP1_INF_BV_001());

ttcn/AtsMec/AtsMec_UEdistance_TestCases.ttcn

@@ -61,10 +61,10 @@ module AtsMec_UEdistance_TestCases {
         f_init_default_headers_list(-, -, v_headers);
         httpPort.send(
                       m_http_request(
-                                     m_http_request_get(
-                                                        PICS_ME_APP_Q_ZONE_ID_URI & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")),
-                                                        v_headers
-                                                        )
+                                     m_http_request_post(
+                                                         PICS_ME_APP_Q_DIST_URI,
+                                                         v_headers
+                                                         )
                                      )
                       );
         f_selfOrClientSyncAndVerdict(c_prDone, e_success);

ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn

@@ -13,28 +13,6 @@ module LocationAPI_TypesAndValues {
     UInt32 nanoSeconds
   }
   
-  /**
-   * @desc A type containing user information.
-   * @member address_ Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI).
-   * @member accessPointId Identifier of access point, <E-CGI><Cell Portion ID> (reference ETSI TS 129 171).
-   * @member zoneId Identifier of zone
-   * @member resourceURL Self referring URL.
-   * @member locationInfo A type containing location information with latitude, longitude and altitude, in addition the accuracy of the information are provided.
-   * @member contextLocationInfo 
-   * @member ancillaryInfo 
-   */
-  type record UserInfo {
-    universal charstring address_,
-    universal charstring accessPointId,
-    universal charstring zoneId,
-    universal charstring resourceURL,
-    LocationInfo locationInfo optional,
-    universal charstring contextLocationInfo optional,
-    universal charstring ancillaryInfo optional
-  } with {
-    variant (address_) "name as 'address'";
-  } // End of type UserInfo
-
   /**
    * @desc A type containing list of users.
    * @member user Collection of the zone information list.
@@ -43,7 +21,7 @@ module LocationAPI_TypesAndValues {
   type record of UserInfo UserInfos;
   type record UserList {
     UserInfos user optional,
-    universal charstring resourceURL
+    ResourceURL resourceURL
   }
   
   /**
@@ -69,11 +47,11 @@ module LocationAPI_TypesAndValues {
    * @member resourceURL Self referring URL.
    */
   type record ZoneInfo {
-    universal charstring zoneId,
-    UInt32 numberOfAccessPoints,
-    UInt32 numberOfUnservicableAccessPoints,
-    UInt32 numberOfUsers,
-    universal charstring resourceURL
+    ZoneId zoneId,
+    NumberOfAccessPoints numberOfAccessPoints,
+    NumberOfUnserviceableAccessPoints numberOfUnservicableAccessPoints,
+    NumberOfUsers numberOfUsers,
+    ResourceURL resourceURL
   }
 
   /**
@@ -84,11 +62,74 @@ module LocationAPI_TypesAndValues {
   type record of ZoneInfo ZoneInfos;
   type record ZoneList {
     ZoneInfos zone optional,
-    universal charstring resourceURL
+    ResourceURL resourceURL
+  }
+
+  /**
+   * @desc 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 universal charstring AccessPointId;
+  
+  /**
+   * @desc A type containing access point information.
+   * @member accessPointId
+   * @member connectionType The connection type for the access poin
+   * @member operationStatus The operation status of the access point
+   * @member numberOfUsers The number of users currently on the access point.
+   * @member resourceURL Self referring URL.
+   */
+  type record AccessPointInfo {
+    AccessPointId accessPointId,
+    ConnectionType connectionType,
+    OperationStatus operationStatus,
+    UInt32 numberOfUsers,
+    ResourceURL resourceURL
+  }
+
+
+  /**
+   * @desc A type containing list of access points.
+   * @member zoneId 
+   * @member accessPoint Collection of the access point information list.
+   * @member resourceURL 
+   */
+  type record AccessPointList {
+    ZoneId zoneId,
+    AccessPointInfo accessPoint optional,
+    ResourceURL resourceURL
+  }
+
+  /**
+   * @desc Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI).
+   */
+  type universal charstring Address
+
+  /**
+   * @desc Reserved for future use.
+   */
+  type universal charstring AncillaryInfo;
+
+  /**
+   * @desc CallBackData if passed by the application during the associated ZonalTrafficSubscription and UserTrackingSubscription operation. See [\
+REST_NetAPI_Common].
+   */
+  type universal charstring CallbackData;
+
+  /**
+   * @desc Notification callback definition.
+   * @member notifyURL 
+   */
+  type record CallbackReference {
+    NotifyURL notifyURL
   }
 
   /**
-   * @desc The connection type for the access point.
+   * @desc Uniquely identifies this create subscription request. If there is a communication failure during the request, using the same clientCorrelator when retrying the request allows the operator to avoid creating a duplicate subscription.
+   */
+  type universal charstring ClientCorrelator;
+
+  /**
+   * @desc The connection type for the access point
    */
   type enumerated ConnectionType {
     Femto,
@@ -103,6 +144,76 @@ module LocationAPI_TypesAndValues {
     Unknown
   }
 
+  /**
+   * @desc Contextual information of a user location (e.g., aisle, floor, room number, etc.)
+   */
+  type universal charstring ContextLocationInfo;
+
+  /**
+   * @desc Zone ID
+   */
+  type universal charstring CurrentAccessPointId;
+
+  /**
+   * @desc Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the period of time for which the subscription will still be valid.
+   */
+  type universal charstring Duration;
+
+  /**
+   * @desc Interest realm of access point (e.g. geographical area, a type of industry etc.).
+   */
+  type universal charstring InterestRealm;
+
+  /**
+   * @desc Link to other resources
+   * @member rel Describes the relationship between the URI and the resource.
+   * @member href UTI
+   */
+  type record Link {
+    universal charstring rel,
+    universal charstring href
+  }
+
+  /**
+   * @desc The URL of your own listener application.
+   */
+  type universal charstring NotifyURL;
+
+  /**
+   * @desc The number of access points within the zone
+   */
+  type UInt32 NumberOfAccessPoints;
+
+  /**
+   * @desc Number of inoperable access points within the zone.
+   */
+  type UInt32 NumberOfUnserviceableAccessPoints;
+
+  /**
+   * @desc The number of users currently on the access point.
+   */
+  type UInt32 NumberOfUsers;
+
+  /**
+   * @desc Threshold number of users in an access point which if crossed shall cause a notification.
+   */
+  type UInt32 NumberOfUsersAPThreshold;
+
+  /**
+   * @desc This element shall be present when ZoneStatusSubscription includes numberOfUsersAPThreshold element and the number of users in an access point exceeds the threshold defined in the subscription.
+   */
+  type UInt32 NumberOfUsersInAP;
+
+  /**
+   * @desc Threshold number of users in a zone which if crossed shall cause a notification.
+   */
+  type UInt32 NumberOfUsersInZone;
+
+  /**
+   * @desc Threshold number of users in a zone which if crossed shall cause a notification.
+   */
+  type UInt32 NumberOfUsersZoneThreshold;
+
   /**
    * @desc The operation status of the access point
    */
@@ -111,27 +222,159 @@ module LocationAPI_TypesAndValues {
     Unserviceable,
     Unknown
   }
-  
+
   /**
-   * @desc A type containing access point information.
-   * @member accessPointId
-   * @member connectionType The connection type for the access poin
-   * @member operationStatus The operation status of the access point
-   * @member numberOfUsers The number of users currently on the access point.
+   * @desc Zone ID
+   */
+  type universal charstring PreviousAccessPointId;
+
+  /**
+   * @desc Self referring URL
+   */
+  type universal charstring ResourceURL;
+
+  /**
+   * @desc Indicates the time of day for zonal presence notification.
+   */
+  type universal charstring Timestamp;
+
+  /**
+   * @desc Time zone of access point
+   */
+  type universal charstring Timezone;
+
+  /**
+   * @desc User event
+   */
+  type enumerated UserEventType {
+    Entering,
+    Leaving,
+    Transferring
+  }
+
+  /**
+   * @desc List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.
+   */
+  type record of UserEventType UserEventCriteria;
+
+  /**
+   * @desc A type containing user information.
+   * @member address_ Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI).
+   * @member accessPointId Identifier of access point, <E-CGI><Cell Portion ID> (reference ETSI TS 129 171).
+   * @member zoneId Identifier of zone
    * @member resourceURL Self referring URL.
+   * @member locationInfo A type containing location information with latitude, longitude and altitude, in addition the accuracy of the information are provided.
+   * @member contextLocationInfo 
+   * @member ancillaryInfo 
    */
-  type record AccessPointInfo {
-    universal charstring accessPointId,
-    ConnectionType connectionType,
-    OperationStatus operationStatus,
-    UInt32 numberOfUsers,
-    universal charstring resourceURL
+  type record UserInfo {
+    Address address_,
+    AccessPointId accessPointId,
+    ZoneId zoneId,
+    ResourceURL resourceURL,
+    LocationInfo locationInfo optional,
+    ContextLocationInfo contextLocationInfo optional,
+    AncillaryInfo ancillaryInfo optional
+  } with {
+    variant (address_) "name as 'address'";
+  } // End of type UserInfo
+
+  /**
+   * @desc A type containing user tracking subscription.
+   * @member 
+   */
+  type record UserTrackingSubscription {
+    ClientCorrelator clientCorrelator optional,
+    CallbackReference callbackReference,
+    Address address_,
+    UserEventCriteria userEventCriteria optional,
+    ResourceURL resourceURL optional
+  } with {
+    variant (address_) "name as 'address'";
+  }
+
+  /**
+   * @desc A type containing zonal presence notification
+   * @member 
+   * @member link Link to other resources that are in relationship with this notification. The server SHOULD include a link to the related subscription. No other links are required or suggested by this specification.
+   */
+  type record ZonalPresenceNotification {
+    CallbackReference callbackReference optional,
+    ZoneId zoneId,
+    Address address_,
+    InterestRealm interestRealm optional,
+    UserEventType userEventType,
+    CurrentAccessPointId currentAccessPointId,
+    PreviousAccessPointId previousAccessPointId optional,
+    Timestamp timestamp_,
+    Link link optional
+  } with {
+    variant (address_) "name as 'address'";
+    variant (timestamp_) "name as 'timestamp'";
+  }
+
+  /**
+   * @desc A type containing zonal traffic subscription
+   * @member
+   * @member interestRealm Interest realms of access points within a zone (e.g. geographical area, a type of industry etc.).
+   * @member userEventCriteria List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.
+   * @member resourceURL 
+   */
+  type record ZonalTrafficSubscription {
+    ClientCorrelator clientCorrelator optional,
+    CallbackReference callbackReference,
+    ZoneId zoneId,
+    InterestRealm interestRealm optional,
+    UserEventCriteria userEventCriteria optional,
+    Duration duration optional,
+    ResourceURL resourceURL optional
+  }
+
+  /**
+   * @desc Identifier of zone
+   */
+  type universal charstring ZoneId;
+
+  /**
+   * @desc A type containing zone status notification.
+   * @member zoneId 
+   * @member 
+   */
+  type record ZoneStatusNotification {
+    CallbackData callbackData optional,
+    ZoneId zoneId,
+    AccessPointId accessPointId optional,
+    NumberOfUsersInZone numberOfUsersInZone optional,
+    NumberOfUsersInAP numberOfUsersInAP optional,
+    OperationStatus operationStatus optional,
+    Timestamp timestamp_,
+    Link link
+  } with {
+    variant (timestamp_) "name as 'timestamp'";
+  }
+
+  /**
+   * @desc A type containing zone status subscription.
+   * @member zoneId
+   * @member
+   * @member
+   * @member
+   * @member operationStatus List of operation status values to generate notifications for (these apply to all access points within a zone).
+   */
+  type record ZoneStatusSubscription {
+    ClientCorrelator clientCorrelator optional,
+    ResourceURL resourceURL optional,
+    CallbackReference callbackReference,
+    ZoneId zoneId,
+    NumberOfUsersZoneThreshold numberOfUsersZoneThreshold optional,
+    NumberOfUsersAPThreshold numberOfUsersAPThreshold optional,
+    OperationStatus operationStatus optional
   }
 
   type record of AccessPointInfo AccessPointInfos
   type record AccessPointInfoList {
     AccessPointInfos AccessPointInfo optional,
-    universal charstring resourceURL
+    ResourceURL resourceURL
   }
   
 } with {

ttcn/LibMec/ttcn/LibMec_Pics.ttcn

@@ -8,13 +8,15 @@ module LibMec_Pics {
   
   /**
    * @desc Does the IUT act as Edge Mobile Application?
-   * TODO Renane into PIC_RNSI
+   * TODO Renane into PIC_RNIS
    */
   modulepar boolean PICS_RNIS_IUT := false;
   
   modulepar charstring PICS_ME_APP_Q_ZONE_ID_URI := "/exampleAPI/location/v2/zones";
   
   modulepar charstring PICS_ME_APP_Q_USERS_LIST_URI := "/exampleAPI/location/v2/users";
+
+  modulepar charstring PICS_ME_APP_Q_DIST_URI := "/exampleAPI/location/v2/subscriptions/distance";
   
   modulepar charstring PICS_ME_APP_Q_UE_IDENTITY_ID_URI := "/exampleAPI/ui/v2/";