Commit 4a802bca authored by Naum Spaseski's avatar Naum Spaseski
Browse files

Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

parents 69fb2227 230f48d6
...@@ -3013,8 +3013,7 @@ module OneM2M_Templates { ...@@ -3013,8 +3013,7 @@ module OneM2M_Templates {
template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := { template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
verificationRequest := true, verificationRequest := true,
//creator := ? //Temporal change, do not commit! creator := ?
creator := *
} }
......
...@@ -2218,13 +2218,14 @@ module OneM2M_Testcases { ...@@ -2218,13 +2218,14 @@ module OneM2M_Testcases {
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)}; p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex)); p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
} }
v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){ if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
f_cse_preamble_registerAe(); f_cse_preamble_registerAe();
} }
v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
} else {//Resource under CSEBase } else {//Resource under CSEBase
...@@ -3306,6 +3307,8 @@ module OneM2M_Testcases { ...@@ -3306,6 +3307,8 @@ module OneM2M_Testcases {
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var CseTester v_notifyHandler;
// Test control // Test control
...@@ -3316,6 +3319,8 @@ module OneM2M_Testcases { ...@@ -3316,6 +3319,8 @@ module OneM2M_Testcases {
// Preamble // Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body // Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
......
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