Commit 50e5eb56 authored by YannGarcia's avatar YannGarcia
Browse files

Completed first Rnis test

parent efd1b3b0
...@@ -64,6 +64,11 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy ...@@ -64,6 +64,11 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
LocationAPI__TypesAndValues::AccessPointList access_point_list; LocationAPI__TypesAndValues::AccessPointList access_point_list;
access_point_list.decode(LocationAPI__TypesAndValues::AccessPointList_descr_, decoding_buffer, TTCN_EncDec::CT_JSON); access_point_list.decode(LocationAPI__TypesAndValues::AccessPointList_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.accessPointList() = access_point_list; msg.accessPointList() = access_point_list;
} else if (it->second.find("\"SubscriptionLinkList\"") != std::string::npos) { // Be carefull to the order
// TODO To be refined, find("\"accessPointList\"") is not optimal
RnisAPI__TypesAndValues::SubscriptionLinkList subscription_link_list;
subscription_link_list.decode(RnisAPI__TypesAndValues::SubscriptionLinkList_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.subscriptionLinkList() = subscription_link_list;
} else if (it->second.find("\"userInfo\"") != std::string::npos) { } else if (it->second.find("\"userInfo\"") != std::string::npos) {
LocationAPI__TypesAndValues::UserInfo user_info; LocationAPI__TypesAndValues::UserInfo user_info;
user_info.decode(LocationAPI__TypesAndValues::UserInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON); user_info.decode(LocationAPI__TypesAndValues::UserInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
......
...@@ -7,14 +7,13 @@ LibCommon_Time.PX_TAC := 30.0 ...@@ -7,14 +7,13 @@ LibCommon_Time.PX_TAC := 30.0
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0; LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;
LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0; LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;
#LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.1.140" LibItsHttp_Pics.PICS_HEADER_HOST := "172.28.4.87"
LibItsHttp_Pics.PICS_HEADER_HOST := "172.16.3.114" #LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.1.21"
#LibItsHttp_Pics.PICS_HEADER_HOST := "172.28.4.87"
LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json" LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibMec_Pics.PICS_PLAT_IUT := true LibMec_Pics.PICS_MEC_PLAT := true
LibMec_Pics.PICS_RNIS_IUT := false LibMec_Pics.PICS_RNIS := true
[LOGGING] [LOGGING]
# In this section you can specify the name of the log file and the classes of events # In this section you can specify the name of the log file and the classes of events
...@@ -32,7 +31,7 @@ LogEventTypes:= Yes ...@@ -32,7 +31,7 @@ LogEventTypes:= Yes
[TESTPORT_PARAMETERS] [TESTPORT_PARAMETERS]
# In this section you can specify parameters that are passed to Test Ports. # In this section you can specify parameters that are passed to Test Ports.
system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.16.3.114,port=8081,use_ssl=0)" system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.28.4.87,port=8081,use_ssl=0)"
[DEFINE] [DEFINE]
# In this section you can create macro definitions, # In this section you can create macro definitions,
......
...@@ -47,8 +47,8 @@ module AtsMec_LocationAPI_TestCases { ...@@ -47,8 +47,8 @@ module AtsMec_LocationAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -63,7 +63,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -63,7 +63,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
PICS_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")), PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")),
v_headers v_headers
) )
) )
......
...@@ -47,8 +47,8 @@ module AtsMec_RadioNodeLocationAPI_TestCases { ...@@ -47,8 +47,8 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -63,7 +63,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { ...@@ -63,7 +63,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
PICS_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints", PX_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints",
v_headers v_headers
) )
) )
......
...@@ -38,7 +38,8 @@ module AtsMec_RnisAPI_TestCases { ...@@ -38,7 +38,8 @@ module AtsMec_RnisAPI_TestCases {
/** /**
* @desc Check that the RNIS service sends all RNIS subscriptions when requested * @desc Check that the RNIS service sends all RNIS subscriptions when requested
* @see Check that the RNIS service sends all RNIS subscriptions when requested * @see https://forge.etsi.org/gitlab/mec/MEC-tests/blob/master/Test%20Purposes/App/Mp1/Rnis/RnisAllSubscriptions_BV.tplan2
* @see
*/ */
testcase TC_MEC025_RNIS_SUBSCRIPTION_005() runs on HttpComponent system HttpTestAdapter { testcase TC_MEC025_RNIS_SUBSCRIPTION_005() runs on HttpComponent system HttpTestAdapter {
// Local variables // Local variables
...@@ -46,8 +47,8 @@ module AtsMec_RnisAPI_TestCases { ...@@ -46,8 +47,8 @@ module AtsMec_RnisAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_RNIS_IUT) or not(PICS_RNIS_ALL_SUBSCRIPTIONS)) { if (not(PICS_RNIS) or not(PICS_RNIS_ALL_SUBSCRIPTIONS)) {
log("*** " & testcasename() & ": PICS_RNIS_IUT and PICS_RNIS_ALL_SUBSCRIPTIONS required for executing the TC ***"); log("*** " & testcasename() & ": PICS_RNIS and PICS_RNIS_ALL_SUBSCRIPTIONS required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -62,7 +63,7 @@ module AtsMec_RnisAPI_TestCases { ...@@ -62,7 +63,7 @@ module AtsMec_RnisAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
PICS_RNIS_SUBSCRITIONS_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), PX_RNIS_SUBSCRITIONS_URI,
v_headers v_headers
) )
) )
...@@ -76,9 +77,11 @@ module AtsMec_RnisAPI_TestCases { ...@@ -76,9 +77,11 @@ module AtsMec_RnisAPI_TestCases {
mw_http_response( mw_http_response(
mw_http_response_ok( mw_http_response_ok(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_cell_change_subscription( mw_body_json_subscriptions_list(
mw_cell_change_subscription mw_subscriptions_list(
))))) -> value v_response { PX_LINKS_SELF,
?
)))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a cell subscription ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a cell subscription ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
......
...@@ -19,7 +19,7 @@ module AtsMec_TestControl { ...@@ -19,7 +19,7 @@ module AtsMec_TestControl {
control { control {
if (PICS_PLAT_IUT) { if (PICS_MEC_PLAT) {
if (PICS_LOCATION_API_SUPPORTED) { if (PICS_LOCATION_API_SUPPORTED) {
execute(TC_MEC_PLAT_MP1_LOC_BV_001()); execute(TC_MEC_PLAT_MP1_LOC_BV_001());
} }
...@@ -36,7 +36,7 @@ module AtsMec_TestControl { ...@@ -36,7 +36,7 @@ module AtsMec_TestControl {
} }
} }
if (PICS_RNIS_IUT) { if (PICS_RNIS) {
if (PICS_RNIS_ALL_SUBSCRIPTIONS) { if (PICS_RNIS_ALL_SUBSCRIPTIONS) {
execute(TC_MEC025_RNIS_SUBSCRIPTION_005()); execute(TC_MEC025_RNIS_SUBSCRIPTION_005());
} }
......
...@@ -46,8 +46,8 @@ module AtsMec_UEdistance_TestCases { ...@@ -46,8 +46,8 @@ module AtsMec_UEdistance_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -62,7 +62,7 @@ module AtsMec_UEdistance_TestCases { ...@@ -62,7 +62,7 @@ module AtsMec_UEdistance_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_post( m_http_request_post(
PICS_ME_APP_Q_DIST_URI, PX_ME_APP_Q_DIST_URI,
v_headers v_headers
) )
) )
......
...@@ -46,8 +46,8 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -46,8 +46,8 @@ module AtsMec_UEidentityAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -62,7 +62,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -62,7 +62,7 @@ module AtsMec_UEidentityAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
PICS_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info?ueIdentityTag=" & oct2char(unichar2oct(PX_UE_IDENTITY_TAG, "UTF-8")), PX_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info?ueIdentityTag=" & oct2char(unichar2oct(PX_UE_IDENTITY_TAG, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -104,8 +104,8 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -104,8 +104,8 @@ module AtsMec_UEidentityAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -120,7 +120,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -120,7 +120,7 @@ module AtsMec_UEidentityAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_post( m_http_request_post(
PICS_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info", PX_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info",
v_headers, v_headers,
m_http_message_body_json( m_http_message_body_json(
m_body_json_ue_identity_tag_info( m_body_json_ue_identity_tag_info(
...@@ -173,8 +173,8 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -173,8 +173,8 @@ module AtsMec_UEidentityAPI_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -189,7 +189,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -189,7 +189,7 @@ module AtsMec_UEidentityAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_post( m_http_request_post(
PICS_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info", PX_ME_APP_Q_UE_IDENTITY_ID_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/ue_identity_tag_info",
v_headers, v_headers,
m_http_message_body_json( m_http_message_body_json(
m_body_json_ue_identity_tag_info( m_body_json_ue_identity_tag_info(
......
...@@ -47,8 +47,8 @@ module AtsMec_UEinformation_TestCases { ...@@ -47,8 +47,8 @@ module AtsMec_UEinformation_TestCases {
var HttpMessage v_response; var HttpMessage v_response;
// Test control // Test control
if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) { if (not(PICS_MEC_PLAT) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -63,7 +63,7 @@ module AtsMec_UEinformation_TestCases { ...@@ -63,7 +63,7 @@ module AtsMec_UEinformation_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
PICS_ME_APP_Q_USERS_LIST_URI, PX_ME_APP_Q_USERS_LIST_URI,
v_headers v_headers
) )
) )
......
module LocationAPI_Templates { module LocationAPI_Templates {
// JSON
import from JSON all;
// LibCommon // LibCommon
import from LibCommon_BasicTypesAndValues all; import from LibCommon_BasicTypesAndValues all;
...@@ -26,7 +29,7 @@ module LocationAPI_Templates { ...@@ -26,7 +29,7 @@ module LocationAPI_Templates {
template (present) Address p_address := ?, template (present) Address p_address := ?,
template (present) AccessPointId p_access_point_id := ?, template (present) AccessPointId p_access_point_id := ?,
template (present) ZoneId p_zone_id := ?, template (present) ZoneId p_zone_id := ?,
template (present) universal charstring p_resource_url := ? template (present) ResourceURL p_resource_url := ?
) := { ) := {
address_ := p_address, address_ := p_address,
accessPointId := p_access_point_id, accessPointId := p_access_point_id,
...@@ -54,8 +57,8 @@ module LocationAPI_Templates { ...@@ -54,8 +57,8 @@ module LocationAPI_Templates {
} // End of template mw_user_list } // End of template mw_user_list
template (value) LocationInfo m_location_info( template (value) LocationInfo m_location_info(
in float p_latitude, in JSON.Number p_latitude,
in float p_longitude, in JSON.Number p_longitude,
in UInt32 p_accuracy in UInt32 p_accuracy
) := { ) := {
latitude := p_latitude, latitude := p_latitude,
...@@ -65,8 +68,8 @@ module LocationAPI_Templates { ...@@ -65,8 +68,8 @@ module LocationAPI_Templates {
} // End of template m_location_info } // End of template m_location_info
template (present) LocationInfo mw_location_info( template (present) LocationInfo mw_location_info(
template (present) float p_latitude := ?, template (present) JSON.Number p_latitude := ?,
template (present) float p_longitude := ?, template (present) JSON.Number p_longitude := ?,
template (present) UInt32 p_accuracy := ? template (present) UInt32 p_accuracy := ?
) := { ) := {
latitude := p_latitude, latitude := p_latitude,
......
...@@ -71,7 +71,7 @@ module LocationAPI_TypesAndValues { ...@@ -71,7 +71,7 @@ module LocationAPI_TypesAndValues {
/** /**
* @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 * @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; type JSON.String AccessPointId;
/** /**
* @desc A type containing access point information. * @desc A type containing access point information.
...@@ -107,12 +107,12 @@ module LocationAPI_TypesAndValues { ...@@ -107,12 +107,12 @@ module LocationAPI_TypesAndValues {
/** /**
* @desc Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI). * @desc Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI).
*/ */
type universal charstring Address type JSON.String Address
/** /**
* @desc Reserved for future use. * @desc Reserved for future use.
*/ */
type universal charstring AncillaryInfo; type JSON.String AncillaryInfo;
/** /**
* @desc CallBackData if passed by the application during the associated ZonalTrafficSubscription and UserTrackingSubscription operation. See [\ * @desc CallBackData if passed by the application during the associated ZonalTrafficSubscription and UserTrackingSubscription operation. See [\
...@@ -131,7 +131,7 @@ REST_NetAPI_Common]. ...@@ -131,7 +131,7 @@ REST_NetAPI_Common].
/** /**
* @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. * @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; type JSON.String ClientCorrelator;
/** /**
* @desc The connection type for the access point * @desc The connection type for the access point
...@@ -152,12 +152,12 @@ REST_NetAPI_Common]. ...@@ -152,12 +152,12 @@ REST_NetAPI_Common].
/** /**
* @desc Contextual information of a user location (e.g., aisle, floor, room number, etc.) * @desc Contextual information of a user location (e.g., aisle, floor, room number, etc.)
*/ */
type universal charstring ContextLocationInfo; type JSON.String ContextLocationInfo;
/** /**
* @desc Zone ID * @desc Zone ID
*/ */
type universal charstring CurrentAccessPointId; type JSON.String 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. * @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.
...@@ -175,14 +175,14 @@ REST_NetAPI_Common]. ...@@ -175,14 +175,14 @@ REST_NetAPI_Common].
* @member href UTI * @member href UTI
*/ */
type record Link { type record Link {
universal charstring rel, JSON.String rel,
universal charstring href JSON.String href
} }
/** /**
* @desc The URL of your own listener application. * @desc The URL of your own listener application.
*/ */
type universal charstring NotifyURL; type JSON.String NotifyURL;
/** /**
* @desc The number of access points within the zone * @desc The number of access points within the zone
...@@ -231,22 +231,22 @@ REST_NetAPI_Common]. ...@@ -231,22 +231,22 @@ REST_NetAPI_Common].
/** /**
* @desc Zone ID * @desc Zone ID
*/ */
type universal charstring PreviousAccessPointId; type JSON.String PreviousAccessPointId;
/** /**
* @desc Self referring URL * @desc Self referring URL
*/ */
type universal charstring ResourceURL; type JSON.AnyURI ResourceURL;
/** /**
* @desc Indicates the time of day for zonal presence notification. * @desc Indicates the time of day for zonal presence notification.
*/ */
type universal charstring Timestamp; type JSON.String Timestamp;
/** /**
* @desc Time zone of access point * @desc Time zone of access point
*/ */
type universal charstring Timezone; type JSON.String Timezone;
/** /**
* @desc User event * @desc User event
...@@ -338,7 +338,7 @@ REST_NetAPI_Common]. ...@@ -338,7 +338,7 @@ REST_NetAPI_Common].
/** /**
* @desc Identifier of zone * @desc Identifier of zone
*/ */
type universal charstring ZoneId; type JSON.String ZoneId;
/** /**
* @desc A type containing zone status notification. * @desc A type containing zone status notification.
......
...@@ -5,6 +5,4 @@ module RnisAPI_Pics { ...@@ -5,6 +5,4 @@ module RnisAPI_Pics {
*/ */
modulepar boolean PICS_RNIS_ALL_SUBSCRIPTIONS := true; modulepar boolean PICS_RNIS_ALL_SUBSCRIPTIONS := true;
modulepar charstring PICS_RNIS_SUBSCRITIONS_URI := "/rni/v2/subscriptions/";
} // End of module RnisAPI_Pics } // End of module RnisAPI_Pics
module RnisAPI_Pixits { module RnisAPI_Pixits {
// JSON
import from JSON all;
// LibMec/Rnis
import from RnisAPI_TypesAndValues all;
modulepar universal charstring PX_SUBSCRIPTION_ID := "7777"; modulepar JSON.String PX_SUBSCRIPTION_ID := "7777";
modulepar Link PX_LINKS_SELF := { self_ := "http://meAppServer.example.com/rni/v1/subscriptions" };
} // End of module RnisAPI_Pixits } // End of module RnisAPI_Pixits
module RnisAPI_Templates { module RnisAPI_Templates {