Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • TST/ATS
1 result
Show changes
Commits on Source (5)
......@@ -1167,6 +1167,15 @@ module OneM2M_Templates {
primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}})}
};
/**
* @desc Base CREATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_createScheduleBase_subscription modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}}, "notificationSchedule")}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createSchedule",
......@@ -1206,7 +1215,7 @@ module OneM2M_Templates {
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
......@@ -4729,7 +4738,7 @@ module OneM2M_Templates {
notificationEvent:= omit,
verificationRequest := omit,
subscriptionDeletion := omit,
subscriptionReference := omit,
subscriptionReference := "NotInitialized",
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
......@@ -4748,7 +4757,7 @@ module OneM2M_Templates {
notificationEvent := *,
verificationRequest := *,
subscriptionDeletion := *,
subscriptionReference := *,
subscriptionReference := ?,
creator := *,
notificationForwardingURI := *,
notificationTarget := *,
......@@ -4762,7 +4771,7 @@ module OneM2M_Templates {
notificationEvent := *,//O
verificationRequest := *,//O
subscriptionDeletion := *,//O
subscriptionReference := *,//M //TODO Put it back to ? subscriptionReference is mandatory
subscriptionReference := ?,//M
creator := *,//O
notificationForwardingURI := *,//O
notificationTarget := *,
......
Subproject commit 478b0f667b7159f89642258f2823c6fde8804779
Subproject commit a52d852868f1af50be7e6636ae82952e510a23d1
......@@ -2581,7 +2581,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_cse_isResourcePresent(v_resourceIndex)){
......@@ -2725,7 +2725,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_cse_isResourcePresent(v_resourceIndex)){
......@@ -2766,6 +2766,10 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
if(vc_ae2.running) {
vc_ae2.stop;
};
if(p_resourceType == int15) {
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
v_request.primitiveContent.container.resourceName := vc_resourcesList[v_resourceIndex].resource.pollingChannel.resourceName;
......@@ -3194,7 +3198,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_cse_isResourcePresent(v_resourceIndex)) {
......@@ -3737,7 +3741,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
// Postamble
f_cse_postamble_deleteResources();
......@@ -5081,7 +5085,11 @@ module OneM2M_PermutationFunctions {
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
if (vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
......@@ -5580,6 +5588,8 @@ module OneM2M_PermutationFunctions {
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
......@@ -5634,7 +5644,9 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ": No answer while updating resource " & int2str(enum2int(p_resourceTypeChild)));
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_childIndex);
// Postamble
......@@ -5674,7 +5686,7 @@ module OneM2M_PermutationFunctions {
p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceAddress(v_acp1Index)});
p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive,{f_getResourceAddress(v_acp2Index)});
infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
//infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, vc_aeIndex);
......@@ -6459,6 +6471,8 @@ module OneM2M_PermutationFunctions {
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
......
......@@ -2071,7 +2071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, v_primitiveContent))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int10002, v_request, v_response.primitive.responsePrimitive);
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002);
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002, vc_remoteCseIndex);
setverdict(pass, __SCOPE__ & ": AEAnnc successfully created.");
if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]) {
......@@ -8528,7 +8528,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_request:= f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
......@@ -8554,6 +8556,8 @@ module OneM2M_Testcases_CSE_Release_1 {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type int3 (Container)");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -8606,7 +8610,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
......@@ -8636,6 +8642,8 @@ module OneM2M_Testcases_CSE_Release_1 {
}
};
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -8691,7 +8699,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); // Subscription resource deletion request
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_notificationContent.subscriptionReference := ?;
......
......@@ -1133,7 +1133,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc1;
v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase_subscription));//Subscription
v_ae1.done;
}
......