Skip to content

GitLab

Commit da939b20 authored by YannGarcia's avatar YannGarcia
Browse files

Finalyze reviewing MEC 011

parent 7d309098
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 119 deletions
ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Pics.ttcn
View file @ da939b20
module AppEnablementAPI_Pics {
modulepar boolean PICS_APP_ENABLEMENT_API_SUPPORTED := true;
} // End of module AppEnablementAPI_Pics
modulepar boolean PICS_ME_APP_SUPPORT_TIMING_CAPS_URI := true;
} // End of module AppEnablementAPI_Pics
ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Pixits.ttcn
View file @ da939b20
......@@ -49,6 +49,10 @@ module AppEnablementAPI_Pixits {
modulepar DnsRule_State PX_DNS_INVALID_STATE := UNKNOWN_VALUE;
modulepar SerAvailabilityNotificationSubscription_CallbackReference PX_SRV_AVAIL_NOTIF_CALLBACK_URI := "";
modulepar TrafficRule_Id PX_TRAFFIC_RULE_ID := "trafficRuleId01";
modulepar TrafficRule_Id PX_NON_EXISTENT_TRAFFIC_RULE_ID := "trafficRuleId99";
} // End of module AppEnablementAPI_Pixits
ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_Templates.ttcn
View file @ da939b20
......@@ -109,6 +109,14 @@ 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 := {
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 := ?,
......@@ -192,12 +200,82 @@ module AppEnablementAPI_Templates {
state := p_state
} // End of template mw_dns_rule
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
) := {
subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference,
links := p_links,
filteringCriteria := p_filteringCriteria
} // End of template m_srv_avail_notif_subscription
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
) modifies m_srv_avail_notif_subscription := {
subscriptionType := "InvalidSerAvailabilityNotificationSubscription"
} // End of template m_srv_avail_notif_subscription_invalid
template SerAvailabilityNotificationSubscription mw_srv_avail_notif_subscription(
template (present) SerAvailabilityNotificationSubscription_CallbackReference p_callbackReference := ?,
template Self p_links := *,
template ServiceInfo p_filteringCriteria := *
) := {
subscriptionType := "SerAvailabilityNotificationSubscription",
callbackReference := p_callbackReference,
links := p_links,
filteringCriteria := p_filteringCriteria
} // End of template mw_srv_avail_notif_subscription
template (omit) TimingCaps m_timing_caps(
in template (omit) TimeStamp p_timeStamp,
in template (omit) NtpServersList p_ntpServers := omit,
in template (omit) TimingCaps_PtpMastersList p_ptpMasters := omit
) := {
timeStamp := p_timeStamp,
ntpServers := p_ntpServers,
ptpMasters := p_ptpMasters
} // End of template m_timing_caps
template TimingCaps mw_timing_caps(
template TimeStamp p_timeStamp := *,
template NtpServersList p_ntpServers := *,
template TimingCaps_PtpMastersList p_ptpMasters := *
) := {
timeStamp := p_timeStamp,
ntpServers := p_ntpServers,
ptpMasters := p_ptpMasters
} // End of template mw_timing_caps
template (value) CurrentTime m_current_time(
in template (value) Seconds p_seconds,
in template (value) NanoSeconds p_nanoSeconds,
in template (value) TimeSourceStatus p_timeSourceStatus := TRACEABLE
) := {
seconds := p_seconds,
nanoSeconds := p_nanoSeconds,
timeSourceStatus := p_timeSourceStatus
} // End of template m_current_time
template (present) CurrentTime mw_current_time(
template (present) Seconds p_seconds := ?,
template (present) NanoSeconds p_nanoSeconds := ?,
template (present) TimeSourceStatus p_timeSourceStatus := TRACEABLE
) := {
seconds := p_seconds,
nanoSeconds := p_nanoSeconds,
timeSourceStatus := p_timeSourceStatus
} // End of template mw_current_time
template (value) TrafficRule m_traffic_rule(
in TrafficRule_Id p_trafficRuleId,
in TrafficRule_FilterType p_filterType := FLOW,
in TrafficRule_Priority p_priority := 1,
in TrafficFilterList p_trafficFilter := {},
in TrafficRule_Action p_action_,
in TrafficRule_Action p_action_ := FORWARD_AS_IS,
in TrafficRule_State p_state := ACTIVE
) := {
trafficRuleId := p_trafficRuleId,
......@@ -208,7 +286,7 @@ module AppEnablementAPI_Templates {
dstInterface := omit,
state := p_state
} // End of template m_traffic_rule
template (present) TrafficRule mw_traffic_rule(
template (present) TrafficRule_Id p_trafficRuleId := ?,
template (present) TrafficRule_FilterType p_filterType := ?,
......
ttcn/LibMec/AppEna/ttcn/AppEnablementAPI_TypesAndValues.ttcn
View file @ da939b20
......@@ -393,8 +393,8 @@ module AppEnablementAPI_TypesAndValues {
type record SerAvailabilityNotificationSubscription {
SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType,
SerAvailabilityNotificationSubscription_CallbackReference callbackReference,
Self links,
ServiceInfo filteringCriteria
Self links optional,
ServiceInfo filteringCriteria optional
}
/**
......@@ -581,9 +581,9 @@ module AppEnablementAPI_TypesAndValues {
* @desc This type represents the information provided by the mobile edge platform in response to the Timing capabilities Query message.
*/
type record TimingCaps {
TimeStamp timeStamp,
NtpServersList ntpServers,
TimingCaps_PtpMastersList ptpMasters
TimeStamp timeStamp optional,
NtpServersList ntpServers optional,
TimingCaps_PtpMastersList ptpMasters optional
}
/**
......
ttcn/LibMec/ttcn/LibMec_Functions.ttcn
View file @ da939b20
......@@ -210,9 +210,13 @@ module LibMec_Functions {
return v_result;
} // End of function f_check_user_register_state
function f_get_current_time_utc() return UInt64 {
return fx_get_current_time_utc();
} // End of function f_get_current_time_utc
function f_get_current_timestamp_utc() return UInt64 {
return fx_get_current_time_utc();
} // End of function f_get_current_timestamp
} // End of function f_get_current_timestamp_utc
} // End of group helpers
......
ttcn/LibMec/ttcn/LibMec_Pixits.ttcn
View file @ da939b20
......@@ -56,4 +56,6 @@ module LibMec_Pixits {
modulepar charstring PX_MEC_SVC_MGMT_SVC_URI := "/mec_service_mgmt/v1/services";
modulepar charstring PX_ME_APP_SUPPORT_TIMING_CAPS_URI := "";
} // End of module LibMec_Pixits
ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn
View file @ da939b20
......@@ -116,12 +116,15 @@ module LibItsHttp_JsonMessageBodyTypes {
AppTerminationNotificationSubscription appTerminationNotificationSubscription,
DnsRuleList dnsRuleList,
DnsRule dnsRule,
SerAvailabilityNotificationSubscription serAvailabilityNotificationSubscription,
TimingCaps timingCaps,
CurrentTime currentTime,
AppEnablementAPI_TypesAndValues.ProblemDetails problemDetails_app_enablement,
universal charstring raw
} with {
variant ""
}
} with {
variant ""
} // End of module LibItsHttp_JsonMessageBodyTypes
ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn
View file @ da939b20
......@@ -775,6 +775,42 @@ group ams_api {
dnsRuleList := p_dnsRuleList
} // End of template mw_body_json_dns_rule_list
template (value) JsonBody m_body_json_srv_avail_notif_subscription(
in template (value) SerAvailabilityNotificationSubscription p_serAvailabilityNotificationSubscription
) := {
serAvailabilityNotificationSubscription := p_serAvailabilityNotificationSubscription
} // End of template m_body_json_srv_avail_notif_subscription
template (present) JsonBody mw_body_json_srv_avail_notif_subscription(
template (present) SerAvailabilityNotificationSubscription p_serAvailabilityNotificationSubscription := ?
) := {
serAvailabilityNotificationSubscription := p_serAvailabilityNotificationSubscription
} // End of template mw_body_json_srv_avail_notif_subscription
template (value) JsonBody m_body_json_timing_caps(
in template (value) TimingCaps p_timingCaps
) := {
timingCaps := p_timingCaps
} // End of template m_body_json_timing_caps
template (present) JsonBody mw_body_json_timing_caps(
template (present) TimingCaps p_timingCaps := ?
) := {
timingCaps := p_timingCaps
} // End of template mw_body_json_timing_caps
template (value) JsonBody m_body_json_current_time(
in template (value) CurrentTime p_currentTime
) := {
currentTime := p_currentTime
} // End of template m_body_json_current_time
template (present) JsonBody mw_body_json_current_time(
template (present) CurrentTime p_currentTime := ?
) := {
currentTime := p_currentTime
} // End of template mw_body_json_current_time
template (value) JsonBody m_body_json_traffic_rule(
in template (value) TrafficRule p_trafficRule
) := {
......@@ -787,17 +823,17 @@ group ams_api {
trafficRule := p_trafficRule
} // End of template mw_body_json_traffic_rule
template (value) JsonBody m_body_json_traffic_rules_list(
in template (value) TrafficRuleList p_trafficRuleList
) := {
template (value) JsonBody m_body_json_traffic_rule_list(
in template (value) TrafficRuleList p_trafficRuleList
) := {
trafficRuleList := p_trafficRuleList
} // End of template m_body_json_traffic_rules_list
} // End of template m_body_json_traffic_rule_list
template (present) JsonBody mw_body_json_traffic_rules_list(
template (present) TrafficRuleList p_trafficRuleList := ?
) := {
template (present) JsonBody mw_body_json_traffic_rule_list(
template (present) TrafficRuleList p_trafficRuleList := ?
) := {
trafficRuleList := p_trafficRuleList
} // End of template mw_body_json_traffic_rules_list
} // End of template mw_body_json_traffic_rule_list
template (value) JsonBody m_body_json_app_enablement_problem_details(
in template (value) AppEnablementAPI_TypesAndValues.ProblemDetails p_problemDetails
......
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