Skip to content
Snippets Groups Projects

Ae fixes

Merged Ae fixes
AE-fixes into Release1
Merged Bogdan Stanca-Kaposta requested to merge AE-fixes into Release1
Viewing commit f9f72dcc
Prev Next
Show latest version
2 files
+ 861
− 861
Compare changes
  • Side-by-side
  • Inline
Files
2
LibOneM2M/OneM2M_Functions.ttcn
+ 45
− 45
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 327 2017-07-26 06:25:46Z reinaortega $
* $Id: OneM2M_Functions.ttcn 330 2017-07-26 10:02:53Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -401,7 +401,7 @@ module OneM2M_Functions {
tc_ac.stop;
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": Notify verification not received");
setverdict(inconc, __SCOPE__ & "INFO: Notify verification not received");
}
}
} //end f_is_component_done
@@ -542,11 +542,11 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__&":ERROR: Error while updating resource");
setverdict(inconc, __SCOPE__&":INFO: Error while updating resource");
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__&":ERROR: Unexpected message received");
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while updating resource");
@@ -574,11 +574,11 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__&":ERROR: Error while retrieving resource");
setverdict(inconc, __SCOPE__&":INFO: Error while retrieving resource");
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__&":ERROR: Unexpected message received");
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
@@ -605,14 +605,14 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(pass, __SCOPE__&" INFO: Resource" & p_requestPrimitive.to_ & " deleted");
setverdict(pass, __SCOPE__&"INFO: Resource" & p_requestPrimitive.to_ & " deleted");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, __SCOPE__&" INFO: Error while deleting resource " & p_requestPrimitive.to_);
setverdict(inconc, __SCOPE__&"INFO: Error while deleting resource " & p_requestPrimitive.to_);
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&" INFO: No answer while deleting resource " & p_requestPrimitive.to_);
setverdict(inconc, __SCOPE__&"INFO: No answer while deleting resource " & p_requestPrimitive.to_);
}
}
@@ -651,7 +651,7 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__&":ERROR: Error while updating " & v_request.to_ & " resource");
setverdict(inconc, __SCOPE__&":INFO: Error while updating " & v_request.to_ & " resource");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while updating " & v_request.to_ & " resource" );
@@ -680,16 +680,16 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_request(mw_create(p_from, p_to))) -> value v_request {
tc_ac.stop;
setverdict(pass, testcasename() & ": Announcement received");
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := f_getCreateResponsePrimitive(v_request.primitive.requestPrimitive.resourceType, v_request.primitive.requestPrimitive);
mcaPort.send(m_response(v_responsePrimitive));
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, testcasename() & ": Error, unexpected message received");
setverdict(fail, __SCOPE__ & ":ERROR: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No announcement received");
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
}
}
@@ -720,30 +720,30 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_request {
tc_ac.stop;
setverdict(pass, testcasename() & ": Notification received");
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
// if(f_isHierarchical(v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
// setverdict(fail, testcasename() & ": Creator cannot contain a hierarchical address");
// setverdict(fail, __SCOPE__ & ": Creator cannot contain a hierarchical address");
// v_responsePrimitive.responseStatusCode := int4000;
// }
// if(f_compareURIs(p_creatorIndex, v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
// setverdict(pass, testcasename() & ": Creator set to originator of the subscription creation primitive");
// setverdict(pass, __SCOPE__ & ": Creator set to originator of the subscription creation primitive");
// } else {
// setverdict(fail, testcasename() & ": Creator not set to originator of the subscription creation primitive");
// setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
// v_responsePrimitive.responseStatusCode := int4000;
// }
mcaPort.send(m_httpResponse(v_responsePrimitive));
}
[] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
tc_ac.stop;
setverdict(fail, testcasename() & ": Notification received but verificationRequest isn't set to TRUE");
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, testcasename() & ": Error, unexpected message received");
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No notification received");
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
@@ -760,63 +760,63 @@ module OneM2M_Functions {
if(isvalue(p_response.primitiveContent.accessControlPolicy) and
not(ispresent(p_response.primitiveContent.accessControlPolicy.resourceName))) {
p_response.primitiveContent.accessControlPolicy.resourceName := p_request.primitiveContent.accessControlPolicy.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy.resourceName)
}
}
case (int2) {
if(isvalue(p_response.primitiveContent.aE) and
not(ispresent(p_response.primitiveContent.aE.resourceName))) {
p_response.primitiveContent.aE.resourceName := p_request.primitiveContent.aE.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE.resourceName)
}
}
case (int3) {
if(isvalue(p_response.primitiveContent.container) and
not(ispresent(p_response.primitiveContent.container.resourceName))) {
p_response.primitiveContent.container.resourceName := p_request.primitiveContent.container.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container.resourceName)
}
}
case (int4) {
if(isvalue(p_response.primitiveContent.contentInstance) and
not(ispresent(p_response.primitiveContent.contentInstance.resourceName))) {
p_response.primitiveContent.contentInstance.resourceName := p_request.primitiveContent.contentInstance.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance.resourceName)
}
}
case (int15) {
if (isvalue(p_response.primitiveContent.pollingChannel) and
not(ispresent(p_response.primitiveContent.pollingChannel.resourceName))) {
p_response.primitiveContent.pollingChannel.resourceName := p_request.primitiveContent.pollingChannel.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel.resourceName)
}
}
case (int16) {
if (isvalue(p_response.primitiveContent.remoteCSE) and
not(ispresent(p_response.primitiveContent.remoteCSE.resourceName))) {
p_response.primitiveContent.remoteCSE.resourceName := p_request.primitiveContent.remoteCSE.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE.resourceName)
}
}
case (int18) {
if (isvalue(p_response.primitiveContent.schedule) and
not(ispresent(p_response.primitiveContent.schedule.resourceName))) {
p_response.primitiveContent.schedule.resourceName := p_request.primitiveContent.schedule.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule.resourceName)
}
}
case (int23) {
if (isvalue(p_response.primitiveContent.subscription) and
not(ispresent(p_response.primitiveContent.subscription.resourceName))) {
p_response.primitiveContent.subscription.resourceName := p_request.primitiveContent.subscription.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
}
}
case (int9) {
if (isvalue(p_response.primitiveContent.group_) and
not(ispresent(p_response.primitiveContent.group_.resourceName))) {
p_response.primitiveContent.group_.resourceName := p_request.primitiveContent.group_.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
}
}
case else {
@@ -919,19 +919,19 @@ module OneM2M_Functions {
[] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
tc_ac.stop;
if(f_check_notificationContent(v_request.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, testcasename() & ": Notification received");
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
}
else{
setverdict(fail, testcasename() & ": Notification received but the content doesn't match");
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, testcasename() & ": Error, unexpected message received");
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No notification received");
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
@@ -953,21 +953,21 @@ module OneM2M_Functions {
tc_ac.stop;
mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
if(not(match(v_response.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
setverdict(fail, testcasename() & ": subscriptionDeletion attribute have to be set to TRUE");
setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE");
}
if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, testcasename() & ": Notification received");
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
}
else{
setverdict(fail, testcasename() & ": Notification received but the content doesn't match");
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
}
[] mcaPort.receive{
tc_ac.stop;
setverdict(fail, testcasename() & ": Error, unexpected message received");
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No notification received");
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
@@ -1265,13 +1265,13 @@ module OneM2M_Functions {
var MsgIn v_request;
[] mcaPort.receive(mw_request(?)) -> value v_request {
log("a_default: WARNING: Unexpected request received");
log(__SCOPE__ & ":WARNING: Unexpected request received");
mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
repeat;
}
[] mcaPort.receive {
log("a_ae_default: WARNING: Unexpected message received");
log(__SCOPE__ & ":WARNING: Unexpected message received");
repeat;
}
}
@@ -1503,7 +1503,7 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule.resourceID);
}
log(""&__SCOPE__&":WARNING: Primitive Content Kind not implemented");
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
return "resourceIDNotFound";
@@ -1776,7 +1776,7 @@ module OneM2M_Functions {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
}
log("f_getAeId: WARNING: p_targetResourceIndex does not refer to AE resource");
log(__SCOPE__ & ":WARNING: p_targetResourceIndex does not refer to AE resource");
return "";
} // end f_getAeId
@@ -1841,10 +1841,10 @@ module OneM2M_Functions {
altstep a_default() runs on Tester {
[] tc_wait.timeout {
setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action");
setverdict(inconc, __SCOPE__&":INFO: Timeout while awaiting reaction of the IUT prior to Upper Tester action");
}
[] tc_ac.timeout {
setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message");
setverdict(inconc, __SCOPE__&":INFO: Timeout while awaiting the reception of a message");
}
}
@@ -2158,7 +2158,7 @@ module OneM2M_Functions {
v_response := p_responsePrimitiveContent;
v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitiveContent);
if(not(match(v_response, v_primitiveContent))){
setverdict(inconc, "Preamble: Error resource incomplete, some attribute missing ");
setverdict(inconc, __SCOPE__&":INFO: Resource incomplete, some attribute missing ");
}
}