diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 015d6b3cf14f14f98dfd30460612bd3d61d262a0..33e89d09052afbb674f314244fbfc9bdeaec2f77 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -364,15 +364,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));
}
}
@@ -462,11 +462,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 d9574892c3faa4cd123ca058489ebd7fc8f87b2d..0b5c17186b27391f01888912e455eb2471d44e16 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1863,10 +1863,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);
@@ -1882,10 +1881,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;
@@ -1903,11 +1901,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;
@@ -1925,11 +1922,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;
@@ -1947,11 +1943,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;
@@ -1969,11 +1964,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;
@@ -1991,11 +1985,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;
@@ -2013,10 +2006,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;
@@ -2034,10 +2026,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;
@@ -2055,10 +2046,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;
@@ -2076,12 +2066,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;
@@ -2099,10 +2088,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;
@@ -2120,10 +2108,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;
@@ -2141,10 +2128,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;
@@ -2161,11 +2147,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;
@@ -2182,10 +2167,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;
@@ -2202,10 +2186,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;
@@ -2221,12 +2204,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;
@@ -2244,10 +2226,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;
@@ -2265,10 +2246,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;
@@ -2286,10 +2266,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;
@@ -2306,11 +2285,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;
@@ -2328,10 +2306,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;
@@ -2349,10 +2326,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;
@@ -2370,10 +2346,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;
@@ -2386,9 +2361,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;
@@ -2396,14 +2372,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
@@ -2411,11 +2386,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_)){
@@ -2446,11 +2421,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);
@@ -2490,9 +2465,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;
@@ -2639,7 +2614,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;
@@ -2653,7 +2628,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);
@@ -2765,7 +2740,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
@@ -2778,7 +2753,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);
@@ -3603,7 +3578,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
@@ -3615,7 +3590,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);
@@ -3734,7 +3709,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
@@ -3746,7 +3721,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);
@@ -3869,7 +3844,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
@@ -3881,7 +3856,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);
@@ -4337,7 +4312,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;
@@ -4362,7 +4337,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) {
@@ -5042,7 +5017,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
@@ -5055,7 +5030,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);
@@ -5234,7 +5209,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
@@ -5253,7 +5228,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);
@@ -5376,7 +5351,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
@@ -5389,7 +5364,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);
@@ -5514,7 +5489,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
@@ -5527,7 +5502,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);
@@ -5658,7 +5633,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
@@ -5671,7 +5646,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);
@@ -5773,7 +5748,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
@@ -5786,7 +5761,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);
@@ -5883,7 +5858,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
@@ -5896,7 +5871,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);
@@ -6277,7 +6252,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;
@@ -6299,7 +6274,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
@@ -6412,7 +6387,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
@@ -6440,7 +6415,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
@@ -6582,7 +6557,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;
@@ -6604,7 +6579,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
@@ -6748,7 +6723,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;
@@ -6770,7 +6745,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
@@ -6998,7 +6973,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;
@@ -7020,7 +6995,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
@@ -7136,7 +7111,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;
@@ -7158,7 +7133,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
@@ -7270,7 +7245,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;
@@ -7292,7 +7267,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
@@ -7492,7 +7467,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;
@@ -7510,9 +7485,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));
}
}
@@ -7637,7 +7612,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;
@@ -7655,9 +7630,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));
}
}
@@ -7781,7 +7756,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;
@@ -7799,9 +7774,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));
}
}
@@ -7926,7 +7901,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;
@@ -7944,9 +7919,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));
}
}
@@ -8070,7 +8045,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;
@@ -8088,9 +8063,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));
}
}
@@ -8389,7 +8364,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
@@ -8402,7 +8377,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);
@@ -8669,7 +8644,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
@@ -8682,7 +8657,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);
@@ -8991,7 +8966,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
@@ -9004,7 +8979,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);
@@ -9404,7 +9379,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
@@ -9417,7 +9392,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);
@@ -9559,7 +9534,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;
@@ -9574,7 +9549,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);
@@ -9767,7 +9742,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
@@ -9786,7 +9761,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);
@@ -9983,7 +9958,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
@@ -9996,7 +9971,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);
@@ -10204,7 +10179,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
@@ -10217,7 +10192,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);
@@ -11325,7 +11300,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
@@ -11338,7 +11313,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);
@@ -12554,7 +12529,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;
@@ -12587,7 +12562,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
@@ -13183,7 +13158,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;
@@ -13206,7 +13181,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
@@ -13329,7 +13304,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
@@ -13342,7 +13317,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);
@@ -13458,7 +13433,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;
@@ -13479,7 +13454,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));
@@ -13664,7 +13639,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
@@ -13677,7 +13652,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);
@@ -16535,7 +16510,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
@@ -16559,7 +16534,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);
@@ -17407,7 +17382,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
@@ -17420,7 +17395,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
@@ -17666,7 +17641,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
@@ -17679,7 +17654,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);
@@ -17687,7 +17662,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();
@@ -17710,7 +17685,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
@@ -17725,18 +17700,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;
@@ -17758,7 +17733,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17781,7 +17756,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
@@ -17794,7 +17769,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
@@ -17847,7 +17822,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
@@ -17860,7 +17835,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
@@ -17918,7 +17893,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
@@ -17933,18 +17908,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
@@ -17956,7 +17931,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();
@@ -17984,7 +17959,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
@@ -17997,18 +17972,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;
@@ -18033,7 +18008,7 @@ module OneM2M_Testcases {
}
};
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18057,7 +18032,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
@@ -18072,19 +18047,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;
@@ -18110,7 +18085,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18134,7 +18109,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;
@@ -18151,7 +18126,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"
@@ -18159,10 +18134,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;
@@ -18207,7 +18182,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;
@@ -18224,24 +18199,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))));
@@ -18269,7 +18244,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18293,7 +18268,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;
@@ -18309,23 +18284,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))));
@@ -18348,7 +18323,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18372,7 +18347,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;
@@ -18387,7 +18362,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);
@@ -18395,12 +18370,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;
@@ -18422,7 +18397,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18448,7 +18423,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
@@ -18463,18 +18438,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
@@ -18488,7 +18463,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();
@@ -18514,7 +18489,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
@@ -18529,7 +18504,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);
@@ -18539,12 +18514,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
@@ -18558,7 +18533,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();
@@ -18583,7 +18558,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;
@@ -18599,7 +18574,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);
@@ -18607,12 +18582,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;
@@ -18634,7 +18609,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18661,7 +18636,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
@@ -18674,7 +18649,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"
@@ -18682,12 +18657,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;
@@ -18709,7 +18684,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18764,7 +18739,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
@@ -18779,16 +18754,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
@@ -18814,7 +18789,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -18837,7 +18812,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
@@ -18852,16 +18827,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
@@ -18885,7 +18860,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_is_component_done(v_ae2);
//Postamble
f_cse_postamble_deleteResources();