Commit 4688594a authored by Yann Garcia's avatar Yann Garcia

Big fixed on MEC-011 ATS

parent b0ed782c
......@@ -19,7 +19,7 @@ module AppEnablementAPI_Pixits {
modulepar ServiceInfo_Version PX_NEW_SERVICE_INFO_VERSION := "2.0.0";
modulepar ServiceInfo_State PX_SERVICE_INFO_STATE := ACTIVE;
modulepar ServiceState PX_SERVICE_INFO_STATE := ACTIVE;
modulepar SerializerTypes PX_SERIALIZER := JSON;
......
......@@ -49,7 +49,7 @@ module AppEnablementAPI_Templates {
template (omit) ServiceInfo m_service_info(
in SerName p_serName,
in ServiceInfo_Version p_version := PX_SERVICE_INFO_VERSION,
in ServiceInfo_State p_state := PX_SERVICE_INFO_STATE,
in ServiceState p_state := PX_SERVICE_INFO_STATE,
in SerializerTypes p_serializer := PX_SERIALIZER,
//in ServiceInfo_Link p_links := PX_LINKS_SERVICE_INFO,
in template (omit) SerInstanceId p_serInstanceId := omit,
......@@ -75,7 +75,7 @@ module AppEnablementAPI_Templates {
template ServiceInfo mw_service_info(
template (present) SerName p_serName := ?,
template (present) ServiceInfo_Version p_version := ?,
template (present) ServiceInfo_State p_state := ?,
template (present) ServiceState p_state := ?,
template (present) SerializerTypes p_serializer := ?,
//template (present) ServiceInfo_Link p_links := ?,
template SerInstanceId p_serInstanceId := *,
......@@ -111,17 +111,15 @@ module AppEnablementAPI_Templates {
} // End of template mw_subscription_link_list
template (value) Self m_self(
in template (value) LinkType p_self_,
in template (value) JSON.Bool p_readOnly := false
in template (value) LinkType p_self_
) := {
self_ := p_self_,
readOnly := p_readOnly
self_ := p_self_
} // End of template m_self
template (value) AppTerminationNotificationSubscription m_app_termination_notif_subscription(
in template (value) AppTerminationNotificationSubscription_CallbackReference p_callbackReference,
in template (value) Self p_links,
in template (value) AppInstanceId p_appInstanceId
template (omit) AppTerminationNotificationSubscription m_app_termination_notif_subscription(
in template (value) AppTerminationNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit,
in template (value) AppInstanceId p_appInstanceId
) := {
subscriptionType := "AppTerminationNotificationSubscription",
callbackReference := p_callbackReference,
......@@ -129,18 +127,18 @@ module AppEnablementAPI_Templates {
appInstanceId := p_appInstanceId
} // End of template m_app_termination_notif_subscription
template (value) AppTerminationNotificationSubscription m_app_termination_notif_subscription_invalid(
in template (value) AppTerminationNotificationSubscription_CallbackReference p_callbackReference,
in template (value) Self p_links,
in template (value) AppInstanceId p_appInstanceId
) modifies m_app_termination_notif_subscription := {
template (omit) AppTerminationNotificationSubscription m_app_termination_notif_subscription_invalid(
in template (value) AppTerminationNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit,
in template (value) AppInstanceId p_appInstanceId
) modifies m_app_termination_notif_subscription := {
subscriptionType := "InvalidAppTerminationNotificationSubscription"
} // End of template m_app_termination_notif_subscription_invalid
template (present) AppTerminationNotificationSubscription mw_app_termination_notif_subscription(
template (present) AppTerminationNotificationSubscription_CallbackReference p_callbackReference := ?,
template (present) Self p_links := ?,
template (present) AppInstanceId p_appInstanceId := ?
template AppTerminationNotificationSubscription mw_app_termination_notif_subscription(
template (present) AppTerminationNotificationSubscription_CallbackReference p_callbackReference := ?,
template Self p_links := *,
template (present) AppInstanceId p_appInstanceId := ?
) := {
subscriptionType := "AppTerminationNotificationSubscription",
callbackReference := p_callbackReference,
......@@ -223,7 +221,7 @@ module AppEnablementAPI_Templates {
template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription(
in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit,
in template (omit) ServiceInfo p_filteringCriteria := omit
in template (omit) FilteringCriteria p_filteringCriteria := omit
) := {
subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference,
......@@ -234,7 +232,7 @@ module AppEnablementAPI_Templates {
template (omit) SerAvailabilityNotificationSubscription m_srv_avail_notif_subscription_invalid(
in template (value) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference,
in template (omit) Self p_links := omit,
in template (omit) ServiceInfo p_filteringCriteria := omit
in template (omit) FilteringCriteria p_filteringCriteria := omit
) modifies m_srv_avail_notif_subscription := {
subscriptionType := "InvalidSerAvailabilityNotificationSubscription"
} // End of template m_srv_avail_notif_subscription_invalid
......@@ -242,7 +240,7 @@ module AppEnablementAPI_Templates {
template SerAvailabilityNotificationSubscription mw_srv_avail_notif_subscription(
template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?,
template Self p_links := *,
template ServiceInfo p_filteringCriteria := *
template FilteringCriteria p_filteringCriteria := *
) := {
subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference,
......
......@@ -48,7 +48,7 @@ module AppEnablementAPI_TypesAndValues {
type record AppTerminationNotificationSubscription {
SubscriptionType subscriptionType,
AppTerminationNotificationSubscription_CallbackReference callbackReference,
Self links,
Self links optional,
AppInstanceId appInstanceId
} with {
variant (links) "name as '_links'";
......@@ -88,6 +88,7 @@ module AppEnablementAPI_TypesAndValues {
Name name,
CategoryRef_Version version
}
type record length(0..infinity) of CategoryRef CategoryRefList;
/**
* @desc The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.
......@@ -352,8 +353,7 @@ module AppEnablementAPI_TypesAndValues {
* @desc Self-referring URI.
*/
type record Self {
LinkType self_,
JSON.Bool readOnly optional
LinkType self_
} with {
variant (self_) "name as 'self'";
}
......@@ -370,7 +370,7 @@ module AppEnablementAPI_TypesAndValues {
SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType,
SerAvailabilityNotificationSubscription_CallbackReference callbackReference,
Self links optional,
ServiceInfo filteringCriteria optional
FilteringCriteria filteringCriteria optional
} with {
variant (links) "name as '_links'";
}
......@@ -380,6 +380,17 @@ module AppEnablementAPI_TypesAndValues {
*/
type JSON.String SerAvailabilityNotificationSubscription_SubscriptionType;
/**
* @desc Filtering criteria to match services for which events are requested to be reported
*/
type record FilteringCriteria {
SerInstanceIdList serInstanceIds optional,
SerNameList serNames optional,
CategoryRefList serCategories optional,
ServiceStateList states,
JSON.Bool isLocal optional
}
/**
* @desc This type represents the service availability information.
*/
......@@ -403,20 +414,23 @@ module AppEnablementAPI_TypesAndValues {
* @desc Identifier of the service instance assigned by the MEPM / mobile edge platform.
*/
type JSON.String SerInstanceId;
type record length(0..infinity) of SerInstanceId SerInstanceIdList;
/**
* @desc The name of the service. This is how the service producing mobile edge application identifies the service instance it produces.
*/
type JSON.String SerName;
type record length(0..infinity) of SerName SerNameList;
/**
* @desc Contains the state.
*/
type enumerated ServiceInfo_State {
type enumerated ServiceState {
ACTIVE,
INACTIVE,
UNKNOWN // Used for invalid behavior tests
}
type record length(0..infinity) of ServiceState ServiceStateList;
/**
* @desc Link to the "Individual mecServiceLiveness" resource where the MEC platform expects the service instance to send the liveness information.
......@@ -458,7 +472,7 @@ module AppEnablementAPI_TypesAndValues {
SerName serName,
CategoryRef serCategory optional,
ServiceInfo_Version version,
ServiceInfo_State state,
ServiceState state,
TransportId transportId optional,
TransportInfo transportInfo optional,
SerializerTypes serializer,
......
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