Commit 7d309098 authored by YannGarcia's avatar YannGarcia

Resolve merge conflicts

parents 1efe2bc8 3f195118
This diff is collapsed.
......@@ -16,6 +16,8 @@ module Ams_Pixits {
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_CALLBACK_REFERENCE := "http://127.0.0.1/callback"
modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback"
......
......@@ -55,6 +55,14 @@ module Ams_Templates {
mepId := p_mepId
}
template (omit) ServiceConsumerIdWithError m_service_consumer_id_with_error(
in template (omit) String p_appId := omit,
in template (omit) String p_mepId := omit
) := {
appId := p_appId,
mepId := p_mepId
}
template (omit) ServiceConsumer m_service_consumer_error(
in template (omit) String p_appInstance := omit,
in template (omit) String p_mepId := omit
......@@ -82,6 +90,17 @@ module Ams_Templates {
}
template (omit) RegistrationRequestWithError m_registration_request_with_error (
in template (omit) ServiceConsumerIdWithError p_service_consumer_id_with_error := omit,
in template (omit) DeviceInformations p_device_info := omit,
in template (omit) UInt32 p_expire_time := omit
) := {
serviceConsumerIdWithError := p_service_consumer_id_with_error,
deviceInformation := p_device_info,
expiryTime := p_expire_time
}
template (omit) RegistrationRequest m_registration_request_error (
in template (omit) ServiceConsumer p_service_consumer := omit,
in template (omit) DeviceInformations p_device_info := omit,
......
......@@ -28,12 +28,24 @@ type record RegistrationRequest {
}
type record RegistrationRequestWithError {
ServiceConsumerIdWithError serviceConsumerIdWithError,
DeviceInformations deviceInformation optional,
UInt32 expiryTime optional
}
type record of ServiceConsumerId ServiceConsumerIds;
type record ServiceConsumerId {
String appInstanceId optional,
String mepId optional
}
type record ServiceConsumerIdWithError {
String appId optional,
String mepId optional
}
// Erroneous parameter: appInstance should be appInstanceId
type record of ServiceConsumer ServiceConsumers;
type record ServiceConsumer {
......
......@@ -33,7 +33,21 @@ module AppEnablementAPI_Pixits {
modulepar Href PX_NON_EXISTENT_SUBSCRIPTION_ID := "";
modulepar DnsRule_Id PX_DNS_RULE_ID := "";
modulepar DnsRule_Id PX_DNS_RULE_ID := "route2home";
modulepar DnsRule_Id PX_NON_EXISTENT_DNS_RULE_ID := "unknownRoute";
modulepar DomainName PX_DOMAIN_NAME := "etsi.org";
modulepar DnsRule_IpAddressType PX_IP_ADDRESS_TYPE := IP_V4;
modulepar DnsRule_IpAddress PX_IP_ADDRESS := "10.10.0.2";
modulepar DnsRule_IpAddress PX_INVALID_IP_ADDRESS := "10.10.0.255";
modulepar Ttl PX_TTL := 0;
modulepar DnsRule_State PX_DNS_INVALID_STATE := UNKNOWN_VALUE;
modulepar TrafficRule_Id PX_TRAFFIC_RULE_ID := "trafficRuleId01";
......
......@@ -161,11 +161,11 @@ module AppEnablementAPI_Templates {
} // End of template mw_transport_info
template (value) DnsRule m_dns_rule(
in DnsRule_Id p_dnsRuleId,
in DomainName p_domainName,
in DnsRule_IpAddressType p_ipAddressType,
in DnsRule_IpAddress p_ipAddress,
in Ttl p_ttl,
in DnsRule_Id p_dnsRuleId := PX_DNS_RULE_ID,
in DomainName p_domainName := PX_DOMAIN_NAME,
in DnsRule_IpAddressType p_ipAddressType := PX_IP_ADDRESS_TYPE,
in DnsRule_IpAddress p_ipAddress := PX_IP_ADDRESS,
in Ttl p_ttl := PX_TTL,
in DnsRule_State p_state := ACTIVE
) := {
dnsRuleId := p_dnsRuleId,
......
......@@ -177,7 +177,8 @@ module AppEnablementAPI_TypesAndValues {
*/
type enumerated DnsRule_State {
ACTIVE,
INACTIVE
INACTIVE,
UNKNOWN_VALUE
}
/**
......
......@@ -54,4 +54,6 @@ module LibMec_Pixits {
modulepar charstring PX_ME_APP_SUPPORT_URI := "";
modulepar charstring PX_MEC_SVC_MGMT_SVC_URI := "/mec_service_mgmt/v1/services";
} // End of module LibMec_Pixits
......@@ -108,6 +108,7 @@ module LibItsHttp_JsonMessageBodyTypes {
AppLCM_TypesAndValues.Notification lcmNotification,
AppContext appContext,
AppInfo appInfo,
Ams_TypesAndValues.RegistrationRequestWithError registrationRequestWithError_ams,
UEAppInterfaceAPI_TypesAndValues.ProblemDetails problemDetails_ue_app_ctxt,
ServiceInfoList serviceInfoList,
ServiceInfo serviceInfo,
......
......@@ -353,6 +353,11 @@ group ams_api {
registrationRequest_ams := p_registrationRequest
} // End of template m_body_json_ue_identity_problem_details
template (value) JsonBody m_body_json_ams_registration_request_with_error(
in template (value) Ams_TypesAndValues.RegistrationRequestWithError p_registrationRequestWithError
) := {
registrationRequestWithError_ams := p_registrationRequestWithError
} // End of template m_body_json_ue_identity_problem_details
template (present) JsonBody mw_body_json_ams_subscriptions(
template (present) Ams_TypesAndValues.MobilityProcedureSubscription p_amsSubscriptionLinkList := ?
......@@ -746,39 +751,39 @@ group ams_api {
transportInfoList := p_transportInfoList
} // End of template mw_body_json_transport_info_list
template (value) JsonBody m_body_json_dsn_rule_list(
in template (value) DnsRuleList p_dnsRuleList
) := {
dnsRuleList := p_dnsRuleList
} // End of template m_body_json_dsn_rule_list
template (present) JsonBody mw_body_json_dsn_rule_list(
template (present) DnsRuleList p_dnsRuleList := ?
) := {
dnsRuleList := p_dnsRuleList
} // End of template mw_body_json_dsn_rule_list
template (value) JsonBody m_body_json_dsn_rule(
template (value) JsonBody m_body_json_dns_rule(
in template (value) DnsRule p_dnsRule
) := {
dnsRule := p_dnsRule
} // End of template m_body_json_dsn_rule
} // End of template m_body_json_dns_rule
template (present) JsonBody mw_body_json_dsn_rule(
template (present) JsonBody mw_body_json_dns_rule(
template (present) DnsRule p_dnsRule := ?
) := {
dnsRule := p_dnsRule
} // End of template mw_body_json_dsn_rule
} // End of template mw_body_json_dns_rule
template (value) JsonBody m_body_json_dns_rule_list(
in template (value) DnsRuleList p_dnsRuleList
) := {
dnsRuleList := p_dnsRuleList
} // End of template m_body_json_dns_rule_list
template (present) JsonBody mw_body_json_dns_rule_list(
template (present) DnsRuleList p_dnsRuleList := ?
) := {
dnsRuleList := p_dnsRuleList
} // End of template mw_body_json_dns_rule_list
template (value) JsonBody m_body_json_traffic_rule(
in template (value) TrafficRule p_trafficRule
) := {
) := {
trafficRule := p_trafficRule
} // End of template m_body_json_traffic_rule
template (present) JsonBody mw_body_json_traffic_rule(
template (present) TrafficRule p_trafficRule := ?
) := {
template (present) TrafficRule p_trafficRule := ?
) := {
trafficRule := p_trafficRule
} // End of template mw_body_json_traffic_rule
......
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