Commit 737cdd41 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Alignment of Subscription choice union element types as other resource types...


Alignment of Subscription choice union element types as other resource types choice union elements (record length(1..infinity) of)
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 834695b0
......@@ -880,7 +880,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mcaPort.receive(mw_request(mw_notify(valueof(v_notificationRequest)))) -> value v_request {
[] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
......
......@@ -2773,11 +2773,11 @@ module OneM2M_Templates {
}
template Subscription_optional mw_contentSubscription_rc4 modifies mw_contentSubscriptionBase := {
choice := {schedule := ?} //O
choice := {choice_list := ?} //O
}
template Subscription_optional mw_contentSubscription_rc5 modifies mw_contentSubscriptionBase := {
choice := {childResource := ?} //O
choice := {childResource_list := ?} //O
}
template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscriptionBase := {
......@@ -2805,7 +2805,7 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
creator := omit,//O
subscriberURI := omit,//O
choice := {childResource := ?}//O
choice := {childResource_list := ?}//O
}
template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
......@@ -2813,7 +2813,7 @@ module OneM2M_Templates {
}
template Subscription_optional mw_contentSubscription_rc8 modifies m_contentSubscription_allOmit := {
choice := {childResource := ?} //O
choice := {childResource_list := ?} //O
}
template ContentInstance_optional mw_contentContentInstanceBase := {
......
......@@ -5215,9 +5215,11 @@ group optionalResourceTypes {
XSD.ID creator optional,
XSD.AnyURI subscriberURI optional,
union {
ChildResourceRef childResource,
Schedule schedule
} choice optional
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Schedule schedule
} choice_list
} choice optional //TODO Replace type of choice union elements as other choice union elements (record length(1..infinity) of)
}
with {
variant "name as uncapitalized";
......@@ -5226,6 +5228,10 @@ group optionalResourceTypes {
//variant (latestNotify) "text 'true' as '1'";
//variant (latestNotify) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
......
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