Commit d0eecbc0 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/oneM2M_Interop06_modifications'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 88841135 cfb514cd
......@@ -3749,7 +3749,8 @@ module OneM2M_Functions {
}
if (p_resourceType == int15) {//pollingChannel
//TODO
//TODO
}
if (p_resourceType == int23) {//subscription
......
......@@ -1535,6 +1535,7 @@ module OneM2M_Templates {
vendorInformation := omit
};
/**
* @desc Base NOTIFY request primitive
*/
......@@ -4472,9 +4473,9 @@ module OneM2M_Templates {
iPEDiscoveryRequest := omit
};
template Notification m_contentNotification_subscriptionVerification modifies m_contentNotification_allOmit:= {
template Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
verificationRequest := true,
creator := "C-AE-ID"
creator := p_creator
};
template Notification mw_contentNotification_any := {
......
......@@ -12579,7 +12579,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1)));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
......@@ -12654,7 +12654,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
......
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