diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b69a5262daad0ee2bf7c404f8dfe1d2ccc2060b0..4f2285a4220449936daa7af54e3ecac93551b59a 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -399,15 +399,15 @@ module OneM2M_Functions {
}
- function f_cse_preamble_subscriptionVerification(out AeSimu p_notifyHandler,in integer p_aeIndex, inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
+ function f_cse_preamble_subscriptionVerification(out AeSimu p_ae2,in integer p_aeIndex, inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
if(p_resourceType == int23){
- p_notifyHandler := AeSimu.create("NotifyHandler") alive;
- p_notifyHandler.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
- p_ae2Index := f_getResource(p_notifyHandler);
+ p_ae2 := AeSimu.create("AE2") alive;
+ p_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
+ p_ae2Index := f_getResource(p_ae2);
if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
}
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_aeIndex, p_responseStatusCode));
+ p_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_aeIndex, p_responseStatusCode));
}
}
@@ -497,11 +497,11 @@ module OneM2M_Functions {
}
- function f_is_component_done(in Tester p_notifyHandler) runs on Tester {
+ function f_is_component_done(in Tester p_ae2) runs on Tester {
tc_ac.start(10.0);
alt {
- [] p_notifyHandler.done {
+ [] p_ae2.done {
tc_ac.stop;
}
[] tc_ac.timeout {
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index a0227ad08a4ed8673cbc5bb93b0248372280c27f..d370364b7cc53466fdcdd8ee690b711e1bdd6798 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1946,10 +1946,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;//TODO useless but need to be initialized see if we can remove it
v_createRequest.primitiveContent.container.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -, v_notifyHandler)); //Container
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
v_ae1.done;
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
@@ -1965,10 +1964,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit),v_notifyHandler));//Container
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
v_ae1.done;
@@ -1986,11 +1984,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase, v_notifyHandler));//Container
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase));//Container
v_ae1.done;
@@ -2008,11 +2005,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.group_.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, -, v_notifyHandler));//Group
+ v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, -));//Group
v_ae1.done;
@@ -2030,11 +2026,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.group_.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler));//Group
+ v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit)));//Group
v_ae1.done;
@@ -2052,11 +2047,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
-
+
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, -, v_notifyHandler));//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, -));//AccessControlPolicy
v_ae1.done;
@@ -2074,11 +2068,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler));//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit)));//AccessControlPolicy
v_ae1.done;
@@ -2096,10 +2089,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -, v_notifyHandler));//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
v_ae1.done;
@@ -2117,10 +2109,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler));//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
v_ae1.done;
@@ -2138,10 +2129,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase, v_notifyHandler));//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
v_ae1.done;
@@ -2159,12 +2149,11 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler));//PollingChannel
+ v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit)));//PollingChannel
v_ae1.done;
@@ -2182,10 +2171,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
v_ae1.done;
@@ -2203,10 +2191,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("AE2") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
v_ae1.done;
@@ -2224,10 +2211,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
v_ae1.done;
@@ -2244,11 +2230,10 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
v_ae1.done;
@@ -2265,10 +2250,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
v_ae1.done;
@@ -2285,10 +2269,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
-
+
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
v_ae1.done;
@@ -2304,12 +2287,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createNodeBase;
var ResponsePrimitive v_responsePrimitive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.node.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -, v_notifyHandler));//Node
+ v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -));//Node
v_ae1.done;
@@ -2327,10 +2309,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.mgmtResource.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -, v_notifyHandler));//Management Command
+ v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
v_ae1.done;
@@ -2348,10 +2329,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -, v_notifyHandler));//Location Policy
+ v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
v_ae1.done;
@@ -2369,10 +2349,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.statsConfig.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -, v_notifyHandler));//Stats Config
+ v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
v_ae1.done;
@@ -2389,11 +2368,10 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.statsCollect.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -, v_notifyHandler));//Stats Collect
+ v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -));//Stats Collect
v_ae1.done;
@@ -2411,10 +2389,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -, v_notifyHandler));//Subscription Profile
+ v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
v_ae1.done;
@@ -2432,10 +2409,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -, v_notifyHandler));//Service Subscribed App
+ v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
v_ae1.done;
@@ -2453,10 +2429,9 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AeSimu v_notifyHandler := AeSimu.create("NotifyHandler") alive;
-
+
v_createRequest.primitiveContent.contentInstance.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase, v_notifyHandler));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//Subscription
v_ae1.done;
@@ -2469,9 +2444,10 @@ module OneM2M_Testcases {
}
- function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in AeSimu p_notifyHandler) runs on AeSimu return ResponsePrimitive {
+ function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu return ResponsePrimitive {
// Local variables
+ var AeSimu v_ae2 := AeSimu.create("AE2") alive;
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_parentIndex := -1;
@@ -2479,14 +2455,13 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
- var AeSimu v_notifyHandler;
// Test control
// Test component configuration
f_cf01Up();
- map(p_notifyHandler:mcaPort, system:mcaPort);
- map(p_notifyHandler:mcaPortIn, system:mcaPortIn);
+ map(v_ae2:mcaPort, system:mcaPort);
+ map(v_ae2:mcaPortIn, system:mcaPortIn);
// Test adapter configuration
@@ -2494,11 +2469,11 @@ module OneM2M_Testcases {
if(ispresent(p_parentRequestPrimitive)) {
if(match(int23, p_parentRequestPrimitive.resourceType)){
- p_notifyHandler.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
- p_notifyHandler.done;
- v_ae2Index := f_getResource(p_notifyHandler);
+ v_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+ v_ae2.done;
+ v_ae2Index := f_getResource(v_ae2);
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
+ v_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
}
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
@@ -2529,11 +2504,11 @@ module OneM2M_Testcases {
// Test Body
if(match(int23, p_requestPrimitive.resourceType)){
- p_notifyHandler.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
- p_notifyHandler.done;
- v_ae2Index := f_getResource(p_notifyHandler);
+ v_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+ v_ae2.done;
+ v_ae2Index := f_getResource(v_ae2);
p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
+ v_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
}
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
@@ -2573,9 +2548,9 @@ module OneM2M_Testcases {
vc_resourcesIndexToBeDeleted := {};
// Tear down
- //notifyHandler.stop;
+ //ae2.stop;
f_cf01Down();
- unmap(p_notifyHandler:mcaPort, system:mcaPort);
+ unmap(v_ae2:mcaPort, system:mcaPort);
return v_response.primitive.responsePrimitive;
@@ -2722,7 +2697,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -2736,7 +2711,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -2848,7 +2823,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -2861,7 +2836,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi)
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -3686,7 +3661,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
// Test control
@@ -3698,7 +3673,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -3817,7 +3792,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
// Test control
@@ -3829,7 +3804,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -3952,7 +3927,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
// Test control
@@ -3964,7 +3939,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -4420,7 +4395,7 @@ module OneM2M_Testcases {
var integer v_containerIndex := -1;
var integer v_parentIndex := -1;
var integer v_acpAuxIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
const XSD.NCName c_accessControlPolicyIDs := "accessControlPolicyIDs";
var integer v_resourceIndex := -1;
@@ -4445,7 +4420,7 @@ module OneM2M_Testcases {
v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_parentIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_parentIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
if(p_resourceType == int4) {
@@ -5125,7 +5100,7 @@ module OneM2M_Testcases {
var integer v_containerIndex := -1;
var integer v_parentIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5138,7 +5113,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
if(p_resourceType == int4) { //ContentInstance
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -5317,7 +5292,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5336,7 +5311,7 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});//c_CRUDNDi;
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5459,7 +5434,7 @@ module OneM2M_Testcases {
var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5472,7 +5447,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5597,7 +5572,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5610,7 +5585,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5741,7 +5716,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5754,7 +5729,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5856,7 +5831,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5869,7 +5844,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5966,7 +5941,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -5979,7 +5954,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -6360,7 +6335,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpIndex := -1;
@@ -6382,7 +6357,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -6495,7 +6470,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -6523,7 +6498,7 @@ module OneM2M_Testcases {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -6665,7 +6640,7 @@ module OneM2M_Testcases {
var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -6687,7 +6662,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -6831,7 +6806,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -6853,7 +6828,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -7081,7 +7056,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -7103,7 +7078,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -7219,7 +7194,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -7241,7 +7216,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -7353,7 +7328,7 @@ module OneM2M_Testcases {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -7375,7 +7350,7 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
@@ -7575,7 +7550,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7593,9 +7568,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7720,7 +7695,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7738,9 +7713,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7864,7 +7839,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7882,9 +7857,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -8009,7 +7984,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -8027,9 +8002,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -8153,7 +8128,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -8171,9 +8146,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -8472,7 +8447,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -8485,7 +8460,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -8752,7 +8727,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -8765,7 +8740,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -9074,7 +9049,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -9087,7 +9062,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -9487,7 +9462,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -9500,7 +9475,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -9642,7 +9617,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -9657,7 +9632,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive , v_aeIndex);
@@ -9850,7 +9825,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -9869,7 +9844,7 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -10066,7 +10041,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -10079,7 +10054,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -10287,7 +10262,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -10300,7 +10275,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -11408,7 +11383,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -11421,7 +11396,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -12637,7 +12612,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
var integer v_acpIndex := -1;
@@ -12670,7 +12645,7 @@ module OneM2M_Testcases {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
@@ -13266,7 +13241,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
@@ -13289,7 +13264,7 @@ module OneM2M_Testcases {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
@@ -13412,7 +13387,7 @@ module OneM2M_Testcases {
var integer v_parentIndex := -1;
var integer v_containerIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -13425,7 +13400,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi)
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -13541,7 +13516,7 @@ module OneM2M_Testcases {
var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
var AccessControlRule v_accessControlRule_1 := valueof(m_createAcr({PX_SUPER_AE_ID}, int63));
var AccessControlRule v_accessControlRule_2;
@@ -13562,7 +13537,7 @@ module OneM2M_Testcases {
v_acpAuxIndex := f_cse_preamble_createAcpAux(-,-);//c_CRDNDi);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRUNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
//Update ACP Aux to remove DELETE operation rights to AE, keeping rights of SUPER USER to run postamble
v_accessControlRule_2 := valueof(m_createAcr({f_getResourceId(vc_resourcesList[v_aeIndex].resource)}, int55));
@@ -13747,7 +13722,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -13760,7 +13735,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -16618,7 +16593,7 @@ module OneM2M_Testcases {
var XSD.AnyURI v_memberId_1;
var XSD.AnyURI v_memberId_2;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
// Test control
@@ -16642,7 +16617,7 @@ module OneM2M_Testcases {
v_subscriptionIndex := f_cse_createResource(int23,m_createSubscriptionBase, v_groupIndex);
- v_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_aeIndex));
+ v_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_aeIndex));
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
@@ -17490,7 +17465,7 @@ module OneM2M_Testcases {
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -17503,7 +17478,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription resource is created
@@ -17749,7 +17724,7 @@ module OneM2M_Testcases {
//Local variables
var template RequestPrimitive v_request := m_createSubscriptionBase;
var integer v_aeIndex := -1;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -17762,7 +17737,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_request, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_request, int23);
// Test Body
v_request := f_getCreateRequestPrimitive(int23, m_createSubscriptionBase, v_aeIndex);
@@ -17770,7 +17745,7 @@ module OneM2M_Testcases {
mcaPort.send(m_request(valueof(v_request)));
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
// Postamble
f_cse_postamble_deleteResources();
@@ -17793,7 +17768,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template PrimitiveContent v_contentNotification := {container := mw_contentContainer_rc1};// all attributes expected
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -17808,18 +17783,18 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
v_request:= f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -17841,7 +17816,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17864,7 +17839,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -17877,7 +17852,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23, int4101);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23, int4101);
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
@@ -17930,7 +17905,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -17943,7 +17918,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23, int5205);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23, int5205);
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
@@ -18001,7 +17976,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -18016,18 +17991,18 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, int2);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 2)); // check that no notification is received
+ v_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 2)); // check that no notification is received
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -18039,7 +18014,7 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18067,7 +18042,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -18080,18 +18055,18 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
v_request.primitiveContent.aE.labels := v_labels_1;
@@ -18116,7 +18091,7 @@ module OneM2M_Testcases {
}
};
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18140,7 +18115,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -18155,19 +18130,19 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int2, omit); //notificationContentType ="modified attributes"
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); //Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
//TODO Use f_getTemplateFromPrimitiveContent() which needs to be modified to receive the template in which the output template will be built upon
v_contentResponse.aE.labels := ?;// only modified attribute expected
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18193,7 +18168,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18217,7 +18192,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18234,7 +18209,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int3, omit); // notificationContentType ="ResourceID"
@@ -18242,10 +18217,10 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -18290,7 +18265,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
var template PrimitiveContent v_retrieveContentResponse;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18307,24 +18282,24 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 3, omit, omit, omit, -, omit); //expirationCounter set to 3
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); // Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
//TODO See if we keep this f_is_component_done, it assure that the retrieve operation is executed after having sent and received the Notification
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
@@ -18352,7 +18327,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18376,7 +18351,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18392,23 +18367,23 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 1, omit, omit, omit, -, omit); //expirationCounter set to 1
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);// Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
//TODO See if we keep this f_is_component_done, it assure that the retrieve operation is executed after having sent and received the Notification
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
@@ -18431,7 +18406,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18455,7 +18430,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18470,7 +18445,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
@@ -18478,12 +18453,12 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
+ v_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -18505,7 +18480,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18531,7 +18506,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -18546,18 +18521,18 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, omit );
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
+ v_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -18571,7 +18546,7 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18597,7 +18572,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -18612,7 +18587,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), true, omit, -, omit);
@@ -18622,12 +18597,12 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -18641,7 +18616,7 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18666,7 +18641,7 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -18682,7 +18657,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
@@ -18690,12 +18665,12 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -18717,7 +18692,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18744,7 +18719,7 @@ module OneM2M_Testcases {
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
var RequestPrimitive v_request;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -18757,7 +18732,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit,f_getResourceAddress(v_ae2Index), -, omit); // SubscriberURI ="ResourceID"
@@ -18765,12 +18740,12 @@ module OneM2M_Testcases {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); // Subscription resource deletion request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_CSE_SUB_DEL_001(f_getResourceAddress(v_resourceIndex))); // check that no notification is received
+ v_ae2.start(f_CSE_SUB_DEL_001(f_getResourceAddress(v_resourceIndex))); // check that no notification is received
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -18792,7 +18767,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18847,7 +18822,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template PrimitiveContent v_contentNotification := {aE:= mw_contentAeBase}; // all attributes expected;
var RequestPrimitive v_deleteRequest;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test control
@@ -18862,16 +18837,16 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -), omit, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
//Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
@@ -18897,7 +18872,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18920,7 +18895,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_contentNotification := {container := mw_contentContainer_rc1}; // all attributes expected in notification;
- var AeSimu v_notifyHandler;
+ var AeSimu v_ae2;
var integer v_ae2Index := -1;
// Test component configuration
@@ -18935,16 +18910,16 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -), omit, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted)
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(v_ae2.running) {
+ v_ae2.stop;
};
//Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ v_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
@@ -18968,7 +18943,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();