Commit a75abed6 authored by YannGarcia's avatar YannGarcia

Add FixedAccessInformationService test cases

parent d1556ffa
...@@ -1576,7 +1576,7 @@ group app_lcm__notification { ...@@ -1576,7 +1576,7 @@ group app_lcm__notification {
[] httpPort_notif.receive( [] httpPort_notif.receive(
mw_http_request( mw_http_request(
mw_http_request_post( mw_http_request_post(
unichar2char(PX_CALLBACK_URI), oct2char(unichar2oct(PX_CALLBACK_URI)),
-, -,
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_lcm_notification( mw_body_json_lcm_notification(
......
...@@ -1213,7 +1213,7 @@ group pkg_management_notification { ...@@ -1213,7 +1213,7 @@ group pkg_management_notification {
[] httpPort_notif.receive( [] httpPort_notif.receive(
mw_http_request( mw_http_request(
mw_http_request_post( mw_http_request_post(
unichar2char(PX_CALLBACK_URI), oct2char(unichar2oct(PX_CALLBACK_URI)),
-, -,
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_app_package_notification( mw_body_json_app_package_notification(
......
This diff is collapsed.
...@@ -6,21 +6,21 @@ module Ams_Pixits { ...@@ -6,21 +6,21 @@ module Ams_Pixits {
// LibMec/LocationAPI // LibMec/LocationAPI
import from Ams_TypesAndValues all; import from Ams_TypesAndValues all;
modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa" modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa";
modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription;
modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3";
modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID" modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID";
modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID" modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID";
modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback" modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback";
modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback" modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback";
modulepar JSON.String PX_MEP_ID := ""; modulepar JSON.String PX_MEP_ID := "";
......
...@@ -174,7 +174,7 @@ module Ams_Templates { ...@@ -174,7 +174,7 @@ module Ams_Templates {
Subscription subscription Subscription subscription
} }
template (value) AdjacentAppInfoSubscription mw_adjacent_application_info_notification ( template (value) AdjacentAppInfoSubscription_ mw_adjacent_application_info_notification (
in template (omit) SubscriptionType p_subscriptionType := omit, in template (omit) SubscriptionType p_subscriptionType := omit,
in JSON.AnyURI p_callbackReference, in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit, in template (omit) JSON.AnyURI p_links := omit,
...@@ -190,7 +190,7 @@ module Ams_Templates { ...@@ -190,7 +190,7 @@ module Ams_Templates {
} }
template (value) MobilityProcedureSubscription m_ams_subscription ( template (value) MobilityProcedureSubscription_ m_ams_subscription (
in SubscriptionType p_subscriptionType := PX_SUBSCRIPTION_TYPE, in SubscriptionType p_subscriptionType := PX_SUBSCRIPTION_TYPE,
in JSON.AnyURI p_callbackReference, in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit, in template (omit) JSON.AnyURI p_links := omit,
...@@ -207,7 +207,7 @@ module Ams_Templates { ...@@ -207,7 +207,7 @@ module Ams_Templates {
template (value) MobilityProcedureSubscription mw_mobility_procedure_notification ( template (value) MobilityProcedureSubscription_ mw_mobility_procedure_notification (
in template (omit) SubscriptionType p_subscriptionType := omit, in template (omit) SubscriptionType p_subscriptionType := omit,
in JSON.AnyURI p_callbackReference, in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit, in template (omit) JSON.AnyURI p_links := omit,
...@@ -237,7 +237,7 @@ module Ams_Templates { ...@@ -237,7 +237,7 @@ module Ams_Templates {
expiryDeadline := p_expiryDeadline expiryDeadline := p_expiryDeadline
} }
template (present) MobilityProcedureSubscription mw_ams_subscription ( template (present) MobilityProcedureSubscription_ mw_ams_subscription (
in SubscriptionType p_subscriptionType, in SubscriptionType p_subscriptionType,
in template (omit) JSON.AnyURI p_callbackReference := omit, in template (omit) JSON.AnyURI p_callbackReference := omit,
in template (omit) JSON.AnyURI p_links := omit, in template (omit) JSON.AnyURI p_links := omit,
......
...@@ -90,8 +90,8 @@ type record MobilityProcedureSubscriptionError { ...@@ -90,8 +90,8 @@ type record MobilityProcedureSubscriptionError {
type record of MobilityProcedureSubscription MobilityProcedureSubscriptions; type record of MobilityProcedureSubscription_ MobilityProcedureSubscriptions;
type record MobilityProcedureSubscription { type record MobilityProcedureSubscription_ {
SubscriptionType subscriptionType, SubscriptionType subscriptionType,
JSON.AnyURI callbackReference, JSON.AnyURI callbackReference,
JSON.AnyURI links optional, JSON.AnyURI links optional,
...@@ -132,8 +132,8 @@ type record ExpiryNotification { ...@@ -132,8 +132,8 @@ type record ExpiryNotification {
TimeStamp expiryDeadline TimeStamp expiryDeadline
} }
type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions; type record of AdjacentAppInfoSubscription_ AdjacentAppInfoSubscriptions;
type record AdjacentAppInfoSubscription { type record AdjacentAppInfoSubscription_ {
SubscriptionType subscriptionType, SubscriptionType subscriptionType,
JSON.AnyURI callbackReference, JSON.AnyURI callbackReference,
JSON.AnyURI links optional, JSON.AnyURI links optional,
......
...@@ -200,30 +200,30 @@ module AppEnablementAPI_Templates { ...@@ -200,30 +200,30 @@ module AppEnablementAPI_Templates {
state := p_state state := p_state
} // End of template mw_dns_rule } // End of template mw_dns_rule
template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription( template (omit) SerAvailabilityNotificationSubscription_ m_srv_avail_notif_subscription(
in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit, in template (omit) Self p_links := omit,
in template (omit) ServiceInfo p_filteringCriteria := omit in template (omit) ServiceInfo p_filteringCriteria := omit
) := { ) := {
subscriptionType := "SerAvailabilityNotificationSubscription", subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference, callbackReference := p_callbackReference,
links := p_links, links := p_links,
filteringCriteria := p_filteringCriteria filteringCriteria := p_filteringCriteria
} // End of template m_srv_avail_notif_subscription } // End of template m_srv_avail_notif_subscription
template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription_invalid( template (omit) SerAvailabilityNotificationSubscription_ m_srv_avail_notif_subscription_invalid(
in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference, in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit, in template (omit) Self p_links := omit,
in template (omit) ServiceInfo p_filteringCriteria := omit in template (omit) ServiceInfo p_filteringCriteria := omit
) modifies m_srv_avail_notif_subscription := { ) modifies m_srv_avail_notif_subscription := {
subscriptionType := "InvalidSerAvailabilityNotificationSubscription" subscriptionType := "InvalidSerAvailabilityNotificationSubscription"
} // End of template m_srv_avail_notif_subscription_invalid } // End of template m_srv_avail_notif_subscription_invalid
template SerAvailabilityNotificationSubscription mw_srv_avail_notif_subscription( template SerAvailabilityNotificationSubscription_ mw_srv_avail_notif_subscription(
template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?, template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?,
template Self p_links := *, template Self p_links := *,
template ServiceInfo p_filteringCriteria := * template ServiceInfo p_filteringCriteria := *
) := { ) := {
subscriptionType := "SerAvailabilityNotificationSubscription", subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference, callbackReference := p_callbackReference,
links := p_links, links := p_links,
......
...@@ -272,7 +272,7 @@ module AppEnablementAPI_TypesAndValues { ...@@ -272,7 +272,7 @@ module AppEnablementAPI_TypesAndValues {
/** /**
* @desc The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type. * @desc The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type.
*/ */
type enumerated Rel { type enumerated Rel_ { // TODO To be renamed into SubscriptionType
AppTerminationNotificationSubscription, AppTerminationNotificationSubscription,
SerAvailabilityNotificationSubscription SerAvailabilityNotificationSubscription
} }
...@@ -282,7 +282,7 @@ module AppEnablementAPI_TypesAndValues { ...@@ -282,7 +282,7 @@ module AppEnablementAPI_TypesAndValues {
*/ */
type record Mp1SubscriptionLinkList_Subscription { type record Mp1SubscriptionLinkList_Subscription {
Href href, Href href,
Rel rel Rel_ rel
} }
type record length(0..infinity) of Mp1SubscriptionLinkList_Subscription Mp1SubscriptionLinkList_SubscriptionList; type record length(0..infinity) of Mp1SubscriptionLinkList_Subscription Mp1SubscriptionLinkList_SubscriptionList;
...@@ -390,7 +390,7 @@ module AppEnablementAPI_TypesAndValues { ...@@ -390,7 +390,7 @@ module AppEnablementAPI_TypesAndValues {
/** /**
* @desc This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services. * @desc This type represents a subscription to the notifications from the mobile edge platform regarding the availability of a mobile edge service or a list of mobile edge services.
*/ */
type record SerAvailabilityNotificationSubscription { type record SerAvailabilityNotificationSubscription_ {
SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType, SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType,
SerAvailabilityNotificationSubscription_CallbackReference callbackReference, SerAvailabilityNotificationSubscription_CallbackReference callbackReference,
Self links optional, Self links optional,
...@@ -708,7 +708,7 @@ module AppEnablementAPI_TypesAndValues { ...@@ -708,7 +708,7 @@ module AppEnablementAPI_TypesAndValues {
} with { } with {
variant (action_) "name as 'action'"; variant (action_) "name as 'action'";
} }
type record of TrafficRule TrafficRuleList type record of TrafficRule TrafficRuleList;
/** /**
* @desc Human-readable description of this transport. * @desc Human-readable description of this transport.
......
...@@ -2,41 +2,40 @@ module AppLCM_Pixits { ...@@ -2,41 +2,40 @@ module AppLCM_Pixits {
// JSON // JSON
import from JSON all; import from JSON all;
// LibMec/AppLCM
import from AppLCM_TypesAndValues all; import from AppLCM_TypesAndValues all;
modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar JSON.String PX_APP_D_ID := "5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar InstantiationState PX_INSTANTIATION_STATE := NOT_INSTANTIATED;
modulepar InstantiationState PX_INSTANTIATION_STATE := NOT_INSTANTIATED
modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar JSON.String PX_NON_EXISTENT_APP_INSTANCE_ID := "PX_NON_EXISTENT_APP_INSTANCE_ID" modulepar JSON.String PX_NON_EXISTENT_APP_INSTANCE_ID := "PX_NON_EXISTENT_APP_INSTANCE_ID";
modulepar TerminationType PX_APP_TERMINATION_TYPE := GRACEFUL modulepar TerminationType PX_APP_TERMINATION_TYPE := GRACEFUL;
modulepar TerminationTypeWithError PX_APP_TERMINATION_TYPE_WITH_ERROR := GRACE modulepar TerminationTypeWithError PX_APP_TERMINATION_TYPE_WITH_ERROR := GRACE;
modulepar OperationType PX_CHANGE_STATE_TO := STARTED modulepar OperationType PX_CHANGE_STATE_TO := STARTED;
modulepar OperationTypeWithError PX_CHANGE_STATE_TO_WITH_ERROR := START modulepar OperationTypeWithError PX_CHANGE_STATE_TO_WITH_ERROR := START;
modulepar JSON.String PX_APP_LCM_OP_OCC_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar JSON.String PX_APP_LCM_OP_OCC_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar JSON.String PX_NON_EXISTENT_APP_LCM_OP_OCC_ID := "PX_NON_EXISTENT_APP_LCM_OP_OCC_ID" modulepar JSON.String PX_NON_EXISTENT_APP_LCM_OP_OCC_ID := "PX_NON_EXISTENT_APP_LCM_OP_OCC_ID";
modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback" modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback";
modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := AppInstanceStateChangeSubscription modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := AppInstanceStateChangeSubscription;
modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3";
modulepar JSON.String PX_NON_ESISTENT_SUBSCRIPTION_ID := "PX_NON_ESISTENT_SUBSCRIPTION_ID" modulepar JSON.String PX_NON_ESISTENT_SUBSCRIPTION_ID := "PX_NON_ESISTENT_SUBSCRIPTION_ID";
modulepar JSON.String PX_NOTIFICATION_ID := "208c95ec-121f-4bc2-b896-be3fe000d3ea" modulepar JSON.String PX_NOTIFICATION_ID := "208c95ec-121f-4bc2-b896-be3fe000d3ea";
modulepar NotificationType PX_NOTIFICATION_TYPE := AppInstNotification modulepar NotificationType PX_NOTIFICATION_TYPE := AppInstNotification;
} // End of module } // End of module
\ No newline at end of file
...@@ -62,7 +62,7 @@ type record AppInstanceInfo { ...@@ -62,7 +62,7 @@ type record AppInstanceInfo {
InstantiationState instantiationState InstantiationState instantiationState
} }
type record of SelectedMECHostInfo SelectedMECHostInfoList type record of SelectedMECHostInfo SelectedMECHostInfoList;
type record SelectedMECHostInfo { type record SelectedMECHostInfo {
} }
......
module FixedAccessInformationServiceAPI_Pics {
modulepar boolean PICS_FAI_API_SUPPORTED := true;
} // End of module FixedAccessInformationServiceAPI_Pics
module FixedAccessInformationServiceAPI_Pixits {
// JSON
import from JSON all;
// LibMec_FixedAccessInformationServiceAPI
import from FixedAccessInformationServiceAPI_TypesAndValues all;
modulepar GatewayId PX_FAI_GW_ID := { "" };
modulepar GatewayId PX_NON_EXISTING_FAI_GW_ID := { "" };
modulepar CmdId PX_FAI_CM_ID := "";
modulepar CmdId PX_NON_EXISTING_FAI_CM_ID := "";
modulepar OnuId PX_FAI_ONU_ID := "";
modulepar OnuId PX_NON_EXISTING_FAI_ONU_ID := "";
modulepar JSON.String PX_FAI_SUB_ID := "";
modulepar JSON.String PX_NON_EXISTING_FAI_SUB_ID := "";
modulepar JSON.AnyURI PX_ONU_ALARM_SUB_CALLBACK_URI := "";
modulepar JSON.String PX_SUBSCRIPTION_ID := "";
modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "";
} // End of module FixedAccessInformationServiceAPI_Pixits
...@@ -6,15 +6,14 @@ module Grant_Pixits { ...@@ -6,15 +6,14 @@ module Grant_Pixits {
// LibMec/LocationAPI // LibMec/LocationAPI
import from Grant_TypesAndValues all; import from Grant_TypesAndValues all;
modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar JSON.String PX_APP_INSTANCE_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar Operation_type PX_APP_OPERATION := INSTANTIATE modulepar Operation_type PX_APP_OPERATION := INSTANTIATE;
modulepar Operation_type_error PX_APP_OPERATION_ERROR := INSTANTIATE modulepar Operation_type_error PX_APP_OPERATION_ERROR := INSTANTIATE;
modulepar JSON.String PX_GRANTING_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3" modulepar JSON.String PX_GRANTING_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3";
modulepar JSON.String PX_NON_EXISTANT_GRANTING_ID := "PX_NON_EXISTANT_GRANTING_ID" modulepar JSON.String PX_NON_EXISTANT_GRANTING_ID := "PX_NON_EXISTANT_GRANTING_ID";
} }
...@@ -33,206 +33,4 @@ module Grant_Templates { ...@@ -33,206 +33,4 @@ module Grant_Templates {
operation := p_app_operation operation := p_app_operation
} }
// template (omit) AppMobilityServiceInfo m_app_mobility_service_info(
// in String p_app_mobility_service_id := PX_APP_MOBILITY_SERVICE_ID,
// in template (omit) RegistrationInfos p_registration_info := omit
// ) := {
// registeredAppMobilityService := p_registration_info,
// appMobilityServiceId := p_app_mobility_service_id
// } // End of template m_app_mobility_service_info
//
//
// template (present) AppMobilityServiceInfo mw_app_mobility_service_info(
// template (present) RegistrationInfos p_registration_info := ?,
// template (present) String p_app_mobility_service_id := ?
// ) := {
// registeredAppMobilityService := p_registration_info,
// appMobilityServiceId := p_app_mobility_service_id
// }
//
// template (omit) RegistrationInfo m_app_mobility_registration_info(
// in template (value) ServiceConsumerId p_serviceConsumerId,
// in template (omit) DeviceInformations p_deviceInformation := omit,
// in template (omit) UInt32 p_expiryTime := omit
// ) := {
// serviceConsumerId := p_serviceConsumerId,
// deviceInformation := p_deviceInformation,
// expiryTime := p_expiryTime
// }
//
// template RegistrationInfo mw_app_mobility_registration_info(
// template (present) ServiceConsumerId p_serviceConsumerId := ?,
// template DeviceInformations p_deviceInformation := *,
// template UInt32 p_expiryTime := *
// ) := {
// serviceConsumerId := p_serviceConsumerId,
// deviceInformation := p_deviceInformation,
// expiryTime := p_expiryTime
// }
//
// template (omit) ServiceConsumerId m_service_consumer_id(
// in template (omit) String p_appInstanceId := omit,
// in template (omit) String p_mepId := omit
// ) := {
// appInstanceId := p_appInstanceId,
// mepId := p_mepId
// }
//
// template ServiceConsumerId mw_service_consumer_id(
// template String p_appInstanceId := *,
// template String p_mepId := *
// ) := {
// appInstanceId := p_appInstanceId,
// mepId := p_mepId
// }
//
// template (omit) RegistrationRequest m_registration_request (
// in template (omit) ServiceConsumerId p_service_consumer_id := omit,
// in template (omit) DeviceInformations p_device_info := omit,
// in UInt32 p_expire_time
// ) := {
// serviceConsumerId := p_service_consumer_id,
// deviceInformation := p_device_info,
// expiryTime := p_expire_time
// }
//
// template RegistrationRequest mw_registration_request(
// template ServiceConsumerId p_service_consumer_id := ?,
// template DeviceInformations p_device_info := omit,
// template UInt32 p_expire_time := omit
// ) := {
// serviceConsumerId := p_service_consumer_id,
// deviceInformation := p_device_info,
// expiryTime := p_expire_time
// }
//
//
// template (value) RegistrationInfo m_registration_info (
// in template (omit) ServiceConsumerId p_service_consumer_id := omit,
// in template (omit) DeviceInformations p_device_info := omit,
// in UInt32 p_expire_time
// ) := {
// serviceConsumerId := p_service_consumer_id,
// deviceInformation := p_device_info,
// expiryTime := p_expire_time
// }
//
// template (present) RegistrationInfo mw_registration_info(
// template (present) ServiceConsumerId p_service_consumer_id := ?,
// template (present) DeviceInformations p_device_info := ?,
// template (present) UInt32 p_expire_time
// ) := {
// serviceConsumerId := p_service_consumer_id,
// deviceInformation := p_device_info,
// expiryTime := p_expire_time
// }
//
//
// template (value) ServiceConsumer m_service_consumer (
// in String p_app_instance,
// in String p_mep_id
// ) := {
// appInstance := p_app_instance,
// mepId := p_mep_id
// }
//
// template (value) DeviceInformation m_device_info (
// in String p_associate_id
// ) := {
// associateId := p_associate_id
// }
//
// template (omit) DeviceInformation mw_device_info (
// in String p_associate_id
// ) := {
// associateId := p_associate_id
// }
// type record AmsSubscriptionLinkList {
// JSON.AnyURI links,
// Subscription subscription
// }
//
//
//
// template (value) MobilityProcedureSubscription m_ams_subscription (
// in SubscriptionType p_subscriptionType,
// in JSON.AnyURI p_callbackReference,
// in JSON.AnyURI p_links,
// in FilterCriteria p_filterCriteria,
// in TimeStamp p_expiryDeadline
//
// ) := {
// subscriptionType := p_subscriptionType ,
// callbackReference := p_callbackReference,
// links := p_links,
// filterCriteria := p_filterCriteria,
// expiryDeadline := p_expiryDeadline
// }
//
//
// template (value) MobilityProcedureSubscriptionError m_ams_subscription_error (
// in SubscriptionType p_subscriptionType,
// in JSON.AnyURI p_callbackReference,
// in JSON.AnyURI p_links,
// in FilterCriteria p_filterCriteria,
// in TimeStamp p_expiryDeadline
//
// ) := {
// subscriptionType := p_subscriptionType,
// callbackReference := p_callbackReference,
// links := p_links,
// filterCriteria := p_filterCriteria,
// expiryDeadline := p_expiryDeadline
// }
//
// template (present) MobilityProcedureSubscription mw_ams_subscription (
// in SubscriptionType p_subscriptionType,
// in JSON.AnyURI p_callbackReference,
// in JSON.AnyURI p_links,
// in FilterCriteria p_filterCriteria,
// in TimeStamp p_expiryDeadline
// ) := {
// subscriptionType := p_subscriptionType ,
// callbackReference := p_callbackReference,
// links := p_links,
// filterCriteria := p_filterCriteria,
// expiryDeadline := p_expiryDeadline
// }
//
//
//
// template (value) ProblemDetails m_problem_details(
// in JSON.String p_type,
// in JSON.String p_title,
// in UInt32 p_status,
// in JSON.String p_detail,
// in JSON.String p_instance
// ) := {
// type_ := p_type,
// title := p_title,
// status := p_status,
// detail := p_detail,
// instance := p_instance
// } // End of template m_problem_details
//
// template (present) ProblemDetails mw_problem_details(
// template (present) JSON.String p_type := ?,
// template (present) JSON.String p_title := ?,
// template (present) UInt32 p_status := ?,
// template (present) JSON.String p_detail := ?,
// template (present) JSON.String p_instance := ?
// ) := {
// type_ := p_type,
// title := p_title,
// status := p_status,
// detail := p_detail,
// instance := p_instance
// } // End of template mw_problem_details
//
//
} // End of module LocationAPI_Templates } // End of module LocationAPI_Templates
...@@ -51,24 +51,12 @@ module LocationAPI_Pixits { ...@@ -51,24 +51,12 @@ module LocationAPI_Pixits {
modulepar Address PX_ACR_UNKNOWN_IP := ""; modulepar Address PX_ACR_UNKNOWN_IP := "";
modulepar Address PX_UE_ZONAL_TRAF_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_LOC_QRY_URI := "";
modulepar JSON.Number PX_UE_COORD_LAT := 0.0; modulepar JSON.Number PX_UE_COORD_LAT := 0.0;
modulepar JSON.Number PX_UE_COORD_LONG := 0.0; modulepar JSON.Number PX_UE_COORD_LONG := 0.0;
modulepar JSON.AnyURI PX_UE_LOC_USERS_URI := "";
modulepar Address PX_ACR_SOME_IP := ""; modulepar Address PX_ACR_SOME_IP := "";
modulepar JSON.AnyURI PX_UE_DIST_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_PERIODIC_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_LOC_USERTRACK_SUB_URI := "";
modulepar CallbackReference PX_USERTRACK_SUB_CALLBACK_URI := { "" }; modulepar CallbackReference PX_USERTRACK_SUB_CALLBACK_URI := { "" };
modulepar CallbackReference PX_TRAFFIC_SUB_CALLBACK_URI := { "" }; modulepar CallbackReference PX_TRAFFIC_SUB_CALLBACK_URI := { "" };
......
...@@ -117,7 +117,7 @@ module LocationAPI_TypesAndValues { ...@@ -117,7 +117,7 @@ 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 JSON.String Address type JSON.String Address;
/** /**
* @desc Reserved for future use. * @desc Reserved for future use.
......
...@@ -2,49 +2,36 @@ module MeoPkgm_Pixits { ...@@ -2,49 +2,36 @@ module MeoPkgm_Pixits {
// JSON // JSON
import from JSON all; import from JSON all;
// LibMec/LocationAPI // LibMec/LocationAPI
import from MeoPkgm_TypesAndValues all; import from MeoPkgm_TypesAndValues all;
modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME" modulepar JSON.String PX_APP_PKG_NAME := "APP_PKG_NAME";
modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION" modulepar JSON.String PX_APP_PKG_VERSION := "APP_PKG_VERSION";
modulepar JSON.String PX_CHECKSUM := "CHECKSUM" modulepar JSON.String PX_CHECKSUM := "CHECKSUM";
modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH" modulepar JSON.String PX_APP_PKG_PATH := "APP_PKG_PATH";
modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED modulepar OperationalState PX_OPERATIONAL_STATE := ENABLED;
modulepar UsageState PX_USAGE_STATE := NOT_IN_USE modulepar UsageState PX_USAGE_STATE := NOT_IN_USE;
modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f" modulepar JSON.String PX_ON_BOARDED_APP_PKG_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID" modulepar JSON.String PX_NON_EXISTENT_APP_PKG_ID := "NON_EXISTENT_APP_PKG_ID";
modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback" modulepar JSON.AnyURI PX_CALLBACK_URI := "http://127.0.0.1/callback";
modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := ON_BOARDING;