Commit b0ed782c authored by Yann Garcia's avatar Yann Garcia

Big fixed on MEC-011 Codec

parent 5b7d84bb
LibIts @ a305e3b0
Subproject commit 05da1c7eb2266da50cbee511c01fb59623187412
Subproject commit a305e3b07ed8b0955a28f25bd3fd0346f97562a8
......@@ -17,15 +17,17 @@ module AppEnablementAPI_Pixits {
modulepar ServiceInfo_Version PX_SERVICE_INFO_VERSION := "1.0.0";
modulepar ServiceInfo_Version PX_NEW_SERVICE_INFO_VERSION := "1.0.0";
modulepar ServiceInfo_Version PX_NEW_SERVICE_INFO_VERSION := "2.0.0";
modulepar ServiceInfo_State PX_SERVICE_INFO_STATE := ACTIVE;
modulepar SerializerTypes PX_SERIALIZER := JSON;
modulepar ServiceInfo_Link PX_LINKS_SERVICE_INFO := { self_ := { href := "http://example.com/exampleAPI/location/v1/serviceinfo" }, liveness := omit };
modulepar SubscriptionType PX_NON_EXISTENT_APP_TERM_NOTIF_SUBSCRIPTION := "";
modulepar SubscriptionType PX_NON_EXISTENT_APP_TERM_NOTIF_SUBSCRIPTION := "subscription666";
modulepar AppTerminationNotificationSubscription_CallbackReference PX_APP_TERM_NOTIF_CALLBACK_URI := "http://www.etsi.org";
modulepar AppTerminationNotificationSubscription_CallbackReference PX_APP_TERM_NOTIF_CALLBACK_URI := "http://example.com/exampleAPI/location/v1/app_termination";
modulepar Href PX_HREF := "http://www.etsi.org";
......
......@@ -51,6 +51,7 @@ module AppEnablementAPI_Templates {
in ServiceInfo_Version p_version := PX_SERVICE_INFO_VERSION,
in ServiceInfo_State 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,
in template (omit) TransportId p_transportId := omit,
in template (omit) TransportInfo p_transportInfo := omit,
......@@ -66,7 +67,9 @@ module AppEnablementAPI_Templates {
serializer := p_serializer,
scopeOfLocality := omit,
consumedLocalOnly := omit,
isLocal := omit
isLocal := omit/*,
livenessInterval := omit,
links := p_links*/
} // End of template m_service_info
template ServiceInfo mw_service_info(
......@@ -74,6 +77,7 @@ module AppEnablementAPI_Templates {
template (present) ServiceInfo_Version p_version := ?,
template (present) ServiceInfo_State p_state := ?,
template (present) SerializerTypes p_serializer := ?,
//template (present) ServiceInfo_Link p_links := ?,
template SerInstanceId p_serInstanceId := *,
template TransportId p_transportId := *,
template TransportInfo p_transportInfo := *,
......@@ -89,7 +93,9 @@ module AppEnablementAPI_Templates {
serializer := p_serializer,
scopeOfLocality := *,
consumedLocalOnly := *,
isLocal := *
isLocal := */*,
livenessInterval := *,
links := p_links*/
} // End of template mw_service_info
template (value) SubscriptionLinkList m_subscription_link_list(
......
......@@ -395,7 +395,8 @@ module AppEnablementAPI_TypesAndValues {
type enumerated SerializerTypes {
JSON,
XML,
PROTOBUF3
PROTOBUF3,
RAW // Used for invalid behavior
}
/**
......@@ -413,7 +414,18 @@ module AppEnablementAPI_TypesAndValues {
*/
type enumerated ServiceInfo_State {
ACTIVE,
INACTIVE
INACTIVE,
UNKNOWN // Used for invalid behavior tests
}
/**
* @desc Link to the "Individual mecServiceLiveness" resource where the MEC platform expects the service instance to send the liveness information.
*/
type record ServiceInfo_Link {
LinkType self_,
LinkType liveness optional
} with {
variant (self_) "name as 'self'";
}
/**
......@@ -451,8 +463,12 @@ module AppEnablementAPI_TypesAndValues {
TransportInfo transportInfo optional,
SerializerTypes serializer,
LocalityType scopeOfLocality optional,
boolean consumedLocalOnly optional,
boolean isLocal optional
JSON.Bool consumedLocalOnly optional,
JSON.Bool isLocal optional/*,
UInt32 livenessInterval optional,
ServiceInfo_Link links
} with {
variant (links) "name as '_links'";*/
}
type record of ServiceInfo ServiceInfoList;
......
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