Skip to content
Snippets Groups Projects
Commit e060459f authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

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


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 9ee3e1ef a66a90aa
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 104
− 76
View file @ e060459f
......@@ -84,7 +84,6 @@ module OneM2M_Functions {
vc_cse1 := CseSimu.create("CSE1") alive;
vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
vc_cse1.done;
// Map
map(self:mcaPort, system:mcaPort);
......@@ -1791,7 +1790,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
tc_ac.start;
......@@ -1912,7 +1911,7 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ": Number of Notification in Aggregatednotification isn't right");
}
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
......@@ -1925,7 +1924,7 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
v_notificationsReceived := v_notificationsReceived + 1;
......@@ -1960,7 +1959,7 @@ module OneM2M_Functions {
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(p_notification))) -> value vc_request {
tc_ac.stop;
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
......@@ -2456,7 +2455,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
[not v_remoteCSERegistered] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
v_remoteCSEResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
......@@ -2471,7 +2470,7 @@ module OneM2M_Functions {
vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start;
tc_ac.start(10.0);
repeat;
}
[] tc_ac.timeout {
......@@ -2559,7 +2558,7 @@ module OneM2M_Functions {
if(p_resourceType == int5) { //CSEBase
v_myResource.cSEBase.resourceName := PX_CSE1_NAME;
v_myResource.cSEBase.resourceType := p_resourceType;
v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_ID);
v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_RESOURCE_ID);
v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
v_myResource.cSEBase.creationTime := fx_generateTimestamp();
v_myResource.cSEBase.creationTime := "20171231T012345";
......@@ -2922,20 +2921,8 @@ module OneM2M_Functions {
log(__SCOPE__&": WARNING: Unexpected CREATE message received");
tc_ac.stop;
v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_parentResourceIndex == -1) {
log(__SCOPE__&": ERROR: Target resource not found");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
} else {
v_localResource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, v_request.primitive.requestPrimitive.resourceType);
v_localResourceIndex := f_setLocalResource(v_localResource, v_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
tc_ac.start(10.0);
repeat;
......@@ -2944,25 +2931,11 @@ module OneM2M_Functions {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected RETRIEVE message received");
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Resource Index not valid");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) {
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}})));
} else {
v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
if(ischosen(vc_localResourcesList[v_localResourceIndex].resource.cSEBase)) {
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response, {{"parentID", omit}})));
} else {
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
}
tc_ac.start(10.0);
repeat;
......@@ -2971,22 +2944,8 @@ module OneM2M_Functions {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected UPDATE message received");
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Resource Index not valid");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
} else {
v_response := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
tc_ac.start(10.0);
repeat;
}
......@@ -2994,20 +2953,19 @@ module OneM2M_Functions {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected DELETE message received");
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Resource Index not valid");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
} else {
v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
tc_ac.start(10.0);
repeat;
}
[] mccPortIn.receive(mw_request(mw_notify)) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
//Send response in any case
v_response := valueof(m_responseNotification(int2000, omit));
v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
tc_ac.start(10.0);
repeat;
}
......@@ -3714,10 +3672,10 @@ module OneM2M_Functions {
} else {
log("Non Hierarchical method: " & v_cleanedURI);
for(i:=0; i < lengthof(vc_localResourcesList); i := i+1){
if(v_cleanedURI == f_getResourceId(vc_localResourcesList[i].resource)){
v_resourceIndex := i;
log("Non Hierarchical method: " & v_cleanedURI);
break;
}
}
......@@ -3726,6 +3684,10 @@ module OneM2M_Functions {
//Try CSEBase
if(v_resourceIndex == -1) {
if(v_cleanedURI == f_getResourceName(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
log("Hierarchical method: " & v_cleanedURI);
v_resourceIndex := vc_cSEBaseIndex;
} else if (v_cleanedURI == f_getResourceId(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
log("Non Hierarchical method: " & v_cleanedURI);
v_resourceIndex := vc_cSEBaseIndex;
}
}
......@@ -3957,7 +3919,7 @@ module OneM2M_Functions {
else if (ischosen(p_requestPrimitive.primitiveContent.statsConfig)){
p_requestPrimitive.primitiveContent.statsConfig.accessControlPolicyIDs := p_accessControlPolicyIDs;
} else {
log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
log( __SCOPE__ & ":INFO: Resource not having acpi attribute. Not possible to set acpi")
}
return valueof(p_requestPrimitive);
}
......@@ -4068,9 +4030,9 @@ module OneM2M_Functions {
} // end f_getAnnouncedResourceType
/**
* @desc Proccessing of the request primitive
* @desc Proccessing of the CREATE request primitive
* @param p_request Request primitive to be processed
* @return p_response Response primitive to be sent back
* @return Local resource index
*/
function f_processCreateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {
var integer v_parentIndex := -1;
......@@ -4095,7 +4057,73 @@ module OneM2M_Functions {
return v_localResourceIndex;
}
/**
* @desc Proccessing of the UPDATE request primitive
* @param p_request Request primitive to be processed
*/
function f_processUpdateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {
var integer v_targetLocalResourceIndex := -1;
v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
if(v_targetLocalResourceIndex == -1) {
setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
} else {
setverdict(pass, __SCOPE__&":INFO: Resource updated successfuly");
f_updateLocalResource(v_targetLocalResourceIndex, p_request.primitiveContent);
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2004,p_request.requestIdentifier));
vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
}
vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
}
/**
* @desc Proccessing of the RETRIEVE request primitive
* @param p_request Request primitive to be processed
*/
function f_processRetrieveRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {
var integer v_targetLocalResourceIndex := -1;
v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
if(v_targetLocalResourceIndex == -1) {
setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
} else {
setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2000,p_request.requestIdentifier));
vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
}
vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
}
/**
* @desc Proccessing of the DELETE request primitive
* @param p_request Request primitive to be processed
*/
function f_processDeleteRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu {
var integer v_targetLocalResourceIndex := -1;
v_targetLocalResourceIndex := f_getResourceIndex(p_request.to_);
if(v_targetLocalResourceIndex == -1) {
setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
} else {
setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2002,p_request.requestIdentifier));
}
vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
}
}//end group getSetFunctions
group CheckingFunctions {
......@@ -4355,14 +4383,14 @@ module OneM2M_Functions {
alt{
[] utPort.receive(mw_utResponseOK) {
tc_wait.stop;
setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
}
[] utPort.receive(mw_utResponseKO) {
tc_wait.stop;
setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
}
[] tc_wait.timeout{
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
}
}
......
LibOneM2M/OneM2M_Pixits.ttcn
+ 1
− 1
View file @ e060459f
......@@ -217,7 +217,7 @@ module OneM2M_Pixits {
/**
* @desc Resources to be deleted by TC_DELETE_RESOURCES
*/
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := { "MyAe", "MyAccessControlPolicyResource", "SubscriptionVerificationAcp", "MyAcp", "MyRemoteCSEResource" };
/**
* @desc To enable run postamble (for debugging)
......
OneM2M_PermutationFunctions.ttcn
+ 169
− 228
View file @ e060459f
This diff is collapsed.
OneM2M_Testcases_AE_Release_1.ttcn
+ 199
− 206
View file @ e060459f
This diff is collapsed.
OneM2M_Testcases_CSE_Release_1.ttcn
+ 1444
− 1294
View file @ e060459f
This diff is collapsed.
OneM2M_Testcases_CSE_Release_2.ttcn
+ 36
− 37
View file @ e060459f
......@@ -235,7 +235,6 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_request;
var template PrimitiveContent v_contentResponse;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_cse1.done;
v_request := valueof(m_createRemoteCSEBase);
v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE
......@@ -291,7 +290,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
var template PrimitiveContent v_contentResponse;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
 
......@@ -520,7 +519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -542,7 +541,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -564,7 +563,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -588,7 +587,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -610,7 +609,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -631,7 +630,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -732,7 +731,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -752,7 +751,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -772,7 +771,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -792,7 +791,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -812,7 +811,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -832,7 +831,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -852,7 +851,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -980,10 +979,10 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
}
}
}
......@@ -1003,10 +1002,10 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
}
}
}
......@@ -3985,7 +3984,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
......@@ -6371,7 +6370,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
}
}
}
......@@ -6409,7 +6408,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
}
}
}
......@@ -6448,7 +6447,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
}
}
}
......@@ -6484,7 +6483,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
}
}
}
......@@ -6520,7 +6519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
setverdict(fail, __SCOPE__, ": Error: Location ID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
}
}
}
......@@ -6555,7 +6554,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
setverdict(fail, __SCOPE__, ": Error: Event Notification Criteria attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
}
}
}
......@@ -6590,7 +6589,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
setverdict(fail, __SCOPE__, ": Error: Expiration Counter attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
}
}
}
......@@ -6625,7 +6624,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
setverdict(fail, __SCOPE__, ": Error: Group ID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
}
}
}
......@@ -6660,7 +6659,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
setverdict(fail, __SCOPE__, ": Error: Notification Forwarding URI attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
}
}
}
......@@ -6695,7 +6694,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
}
}
}
......@@ -6730,7 +6729,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
}
}
}
......@@ -6765,7 +6764,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
}
}
}
......@@ -6800,7 +6799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
}
}
}
......@@ -6835,7 +6834,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
}
}
}
......@@ -6868,7 +6867,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
}
}
}
......@@ -7251,7 +7250,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
}
}
}
......@@ -7287,7 +7286,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
}
}
}
......
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