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

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

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 6c87f367 0778c746
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1539,7 +1539,7 @@ module OneM2M_Templates {
/**
* @desc Base NOTIFY request primitive
*/
template RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, Notification p_notification) modifies m_notify := {
template RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, template (value) Notification p_notification) modifies m_notify := {
primitiveContent := {notification := p_notification},
requestExpirationTimestamp := {alt_1 := 10000}//Needed for polling
};
......
This diff is collapsed.
......@@ -710,17 +710,17 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] mccPortIn.receive(mw_request(mw_createAEAnnc())) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": AE creation redirected but wrong parameters");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] mccPortIn.receive(mw_request(?))-> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected message received");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
......@@ -1722,7 +1722,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
//Check to see if the resource is present or not
if (f_isResourcePresent(vc_aeAuxIndex)){
if (f_cse_isResourcePresent(vc_aeAuxIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -2072,7 +2072,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(v_request, v_contentResponse);
//Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
......@@ -3174,7 +3174,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
// Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
setverdict(fail, __SCOPE__ & ":INFO: Resource not deleted");
} else {
setverdict(pass, __SCOPE__ & ":INFO: Resource deleted");
......@@ -4035,7 +4035,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
......@@ -4122,7 +4122,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
......@@ -4282,7 +4282,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -4362,7 +4362,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -5849,7 +5849,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -8699,7 +8699,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8774,7 +8774,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8854,7 +8854,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8928,7 +8928,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -9353,7 +9353,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9438,7 +9438,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9523,7 +9523,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9598,7 +9598,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourceNotPresent(-1, v_createRequest.primitiveContent.accessControlPolicy.resourceName)) {
if(f_cse_isResourceNotPresent(-1, v_createRequest.primitiveContent.accessControlPolicy.resourceName)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -11109,7 +11109,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -11197,7 +11197,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......
......@@ -2335,7 +2335,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
v_ae1.done;
......@@ -2348,7 +2348,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
v_ae1.done;
......@@ -5029,7 +5029,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -8032,7 +8032,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8107,7 +8107,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -8190,7 +8190,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8263,7 +8263,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8495,7 +8495,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -8574,7 +8574,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9101,7 +9101,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -9178,7 +9178,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -13743,7 +13743,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var XSD.NonNegativeInteger v_missingDataPointNumber := 1;
var template PrimitiveContent v_contentNotification := {timeSeries := mw_contentTimeSeries(?,v_missingDataPointNumber)};
v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "P60"));
v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
// Test control
......@@ -13811,7 +13811,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var XSD.NonNegativeInteger v_missingDataPointNumber := 100;
var template PrimitiveContent v_contentResponse;
v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "1000"));
v_eventNotificationCriteria.missingData := valueof(m_missingData(v_missingDataPointNumber, "PT0H"));
// Test control
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment