Commit c0e5ea69 authored by Antonio Castillo Verdugo's avatar Antonio Castillo Verdugo
Browse files

Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

parents 5774c0fd 4ffda5a2
......@@ -922,7 +922,7 @@ module OneM2M_Functions {
*/
function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
......@@ -994,7 +994,7 @@ module OneM2M_Functions {
function f_isResourcePresent (integer p_resourceIndex) runs on AeSimu return boolean {
//Check to see if the resource is present or not
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
......@@ -1023,7 +1023,7 @@ module OneM2M_Functions {
function f_isResourcePresentCseSimu (integer p_resourceIndex) runs on CseSimu return boolean {
//Check to see if the resource is present or not
mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
mccPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000))) {
......@@ -1055,7 +1055,7 @@ module OneM2M_Functions {
log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
//Check to see if the resource has NOT been created
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
......@@ -1335,11 +1335,11 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notify(v_notificationRequest))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(v_notificationRequest))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
}
[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
}
......@@ -1377,7 +1377,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
if(f_check_notificationContent(vc_request.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
......@@ -1413,7 +1413,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_aggregatedNotifyBase)) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyAggregatedNotification)) -> value vc_request {
tc_ac.stop;
if(p_numberOfAggregatedNotification == lengthof(vc_request.primitive.requestPrimitive.primitiveContent.aggregatedNotification.notification_list)){
if(f_check_notificationContent(vc_response.primitive.requestPrimitive, p_primitiveContent)){
......@@ -1431,7 +1431,7 @@ module OneM2M_Functions {
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
if(f_check_notificationContent(vc_request.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
......@@ -1469,7 +1469,7 @@ module OneM2M_Functions {
var ResponsePrimitive v_responsePrimitive;
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notify(p_notification))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(p_notification))) -> value vc_request {
tc_ac.stop;
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
......@@ -1498,7 +1498,7 @@ module OneM2M_Functions {
tc_ac.start(10.0);
alt {
[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
}
......@@ -1582,7 +1582,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_notify(v_notificationRequest))) -> value vc_request {
[] mccPortIn.receive(mw_request(mw_notifyNotification(v_notificationRequest))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
}
......@@ -1617,7 +1617,7 @@ module OneM2M_Functions {
function f_cse_isResourcePresent (integer p_resourceIndex) runs on CseSimu return boolean {
//Check to see if the resource is present or not
mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
mccPort.send(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000))) {
......@@ -1850,7 +1850,7 @@ module OneM2M_Functions {
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
[] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value v_request {
//Send response
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
......@@ -2195,6 +2195,12 @@ module OneM2M_Functions {
if(match(valueof(p_request.primitiveContent.subscription.notificationURI), v_defaultListOfURIs )){
p_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_parentIndex)};
}
//subscriberURI
if(ispresent(p_request.primitiveContent.subscription.subscriberURI)) {
if(match(valueof(p_request.primitiveContent.subscription.subscriberURI), "NotInitialized" )){
p_request.primitiveContent.subscription.subscriberURI := f_getResourceAddress(vc_aeAuxIndex);
}
}
//creator attribute
if(ispresent(p_request.primitiveContent.subscription.creator)) {
p_request.primitiveContent.subscription.creator := f_getCreator(p_parentIndex);
......@@ -2498,7 +2504,7 @@ module OneM2M_Functions {
* @param p_announcementTargetResource Announcement Target Resource
* @return p_annoucementTargetPoA Announcemenet Target PoA
*/
function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "CseBaseTester" ) return charstring {
function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "" ) return charstring {
if(p_protocolBinding == "HTTP") {
return "http://" & p_announcementTargetAddress & "/" & p_announcementTargetResource;
......@@ -3379,6 +3385,41 @@ module OneM2M_Functions {
}
/**
* @desc Retrieve Year from a given timestamp
* @param p_timestamp Given timestamp
* @return Year
*/
function f_getYear(charstring p_timestamp) runs on Tester return charstring {
var charstring v_year;
var integer i;
for(i := 0; i < 3; i := i+1){
v_year := v_year & p_timestamp[i];
}
return v_year;
} // end f_getYear
/**
* @desc Retrieve IP address from a given address which includes port information separated by :
* @param p_addressPort Given address
* @return IPv4 Address
*/
function f_getIpv4Address(charstring p_addressPort) runs on Tester return charstring {
var charstring v_ipv4Address;
var integer i:= 0;
while ((i < lengthof(p_addressPort)-1) and (p_addressPort[i] != ":")){
v_ipv4Address := v_ipv4Address & p_addressPort[i];
i := i + 1;
}
return v_ipv4Address;
} // end f_getIpv4Address
}//end of commonFunctions
group externalFunctions {
......
......@@ -99,11 +99,11 @@ module OneM2M_Templates {
* @param p_targetResourceAddress Target resource address
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
template (value) RequestPrimitive m_retrieve(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
requestIdentifier := "m_retrieveResource" & f_rnd(1, 1000000),
requestIdentifier := "m_retrieve" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
role := omit,
......@@ -125,7 +125,7 @@ module OneM2M_Templates {
* @desc Base Receive RETRIEVE request primitive
* @param p_targetResourceAddress Target resource address
*/
template RequestPrimitive mw_retrieveResource(XSD.ID p_targetResourceAddress) := {
template RequestPrimitive mw_retrieve(XSD.ID p_targetResourceAddress) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := ?,
......@@ -152,7 +152,7 @@ module OneM2M_Templates {
* @param p_targetResourceAddress Target resource address (including "#AttributeName")
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResourceAttributeToOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
template (value) RequestPrimitive m_retrieveAttributeToOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
......@@ -180,7 +180,7 @@ module OneM2M_Templates {
* @param p_attributeList Target attribute list
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResourceAttributeContentOption(XSD.ID p_targetResourceAddress, in template (value) AttributeList_1 p_attributeList, in XSD.ID p_originator) := {
template (value) RequestPrimitive m_retrieveAttributeContentOption(XSD.ID p_targetResourceAddress, in template (value) AttributeList_1 p_attributeList, in XSD.ID p_originator) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
......@@ -208,7 +208,7 @@ module OneM2M_Templates {
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResourceFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieveResource := {
template (value) RequestPrimitive m_retrieveFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
filterCriteria := {
createdBefore := omit,
......@@ -237,7 +237,7 @@ module OneM2M_Templates {
* @param p_filterUsage FilterUsage
* @param p_labels Labels
*/
template (value) RequestPrimitive m_retrieveResourceFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieveResource := {
template (value) RequestPrimitive m_retrieveFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel" & f_rnd(1, 1000000),
filterCriteria := {
createdBefore := omit,
......@@ -265,7 +265,7 @@ module OneM2M_Templates {
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResourceDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DiscResType p_discResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieveResource := {
template (value) RequestPrimitive m_retrieveDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DiscResType p_discResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
filterCriteria := {
createdBefore := omit,
......@@ -294,7 +294,7 @@ module OneM2M_Templates {
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveResourceInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieveResource := {
template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
filterCriteria := {
createdBefore := omit,
......@@ -362,7 +362,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *
discoveryResultType := omit
};
/**
......@@ -533,8 +533,8 @@ module OneM2M_Templates {
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *
filterCriteria := omit,
discoveryResultType := omit
}
......@@ -1040,7 +1040,7 @@ module OneM2M_Templates {
operation := int4,
to_ := p_resourceAddress,
from_ := p_originator,
requestIdentifier := testcasename() & "-m_deleteResource" & f_rnd(1, 1000000),
requestIdentifier := testcasename() & "-m_delete" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
role := omit,
......@@ -1058,13 +1058,13 @@ module OneM2M_Templates {
discoveryResultType := omit
};
template RequestPrimitive mw_deleteRequest(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
operation := int4,
to_ := p_resourceAddress,
from_ := p_from,
requestIdentifier := ?,
resourceType := *,
primitiveContent := *,
resourceType := omit,
primitiveContent := omit,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
......@@ -1077,7 +1077,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *
discoveryResultType := omit
};
}//end group Delete
......@@ -1087,11 +1087,11 @@ module OneM2M_Templates {
/**
* @desc Base NOTIFY request primitive
*/
template RequestPrimitive m_notifyRequest := {
template RequestPrimitive m_notify := {
operation := int5,
to_ := "NotInitialized",
from_ := omit,
requestIdentifier := testcasename() & "-m_notifyRequest" & f_rnd(1, 1000000),
requestIdentifier := testcasename() & "-m_notify" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := {notification := m_contentCreateNotification_allOmit},
role := omit,
......@@ -1112,11 +1112,11 @@ module OneM2M_Templates {
/**
* @desc Base NOTIFY Aggregated request primitive
*/
template RequestPrimitive m_notifyAggregatedRequest := {
template RequestPrimitive m_notifyAggregatedNotification := {
operation := int5,
to_ := "NotInitialized",
from_ := omit,
requestIdentifier := testcasename() & "-m_notifyAggregatedRequest" & f_rnd(1, 1000000),
requestIdentifier := testcasename() & "-m_notifyAggregatedNotification" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := {aggregatedNotification := {notification_list := {m_contentCreateNotification_allOmit,m_contentCreateNotification_allOmit}}},
role := omit,
......@@ -1137,12 +1137,12 @@ module OneM2M_Templates {
/**
* @desc Base NOTIFY request primitive
*/
template RequestPrimitive mw_notifyBase := {
template RequestPrimitive mw_notify := {
operation := int5,
to_ := ?,
from_ := *,
requestIdentifier := ?,
resourceType := *,
resourceType := omit,
primitiveContent := {notification := mw_contentNotificationBase},
role := *,
originatingTimestamp := *,
......@@ -1150,45 +1150,27 @@ module OneM2M_Templates {
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
resultPersistence := *,
resultContent := *,
resultPersistence := omit,
resultContent := omit,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *
filterCriteria := omit,
discoveryResultType := omit
};
/**
* @desc Base NOTIFY request primitive
*/
template RequestPrimitive mw_aggregatedNotifyBase := {
operation := int5,
to_ := ?,
from_ := *,
requestIdentifier := ?,
resourceType := *,
primitiveContent := { aggregatedNotification := ?},
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
resultPersistence := *,
resultContent := *,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *
template RequestPrimitive mw_notifyAggregatedNotification (in template (present) AggregatedNotification p_aggregatedNotification := ?) modifies mw_notify := {
primitiveContent := { aggregatedNotification := p_aggregatedNotification}
};
/**
* @desc Base NOTIFY request primitive
*/
template RequestPrimitive mw_notify(in template (present) Notification p_notification) modifies mw_notifyBase := {
template RequestPrimitive mw_notifyNotification(in template (present) Notification p_notification) modifies mw_notify := {
primitiveContent := {notification := p_notification}
};
......@@ -1940,7 +1922,7 @@ module OneM2M_Templates {
expirationTime := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
locationSource := omit, //M
locationSource := int1, //M
locationUpdatePeriod := omit, //O
locationTargetID := omit, //O
locationServer := omit,//O
......
......@@ -95,13 +95,13 @@ module OneM2M_Types {
ListOfURIs accessControlOriginators,
AccessControlOperations accessControlOperations,
record of record {
record of ScheduleEntry accessControlWindow_list,
record of ScheduleEntry accessControlWindow_list optional,//TODO It must be optional
record {
record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//TODO It must be optional,
record length(1 .. infinity) of Ipv6 ipv6Addresses optional//TODO It must be optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
} accessControlContexts_list
} accessControlContexts_list optional //TODO It must be optional
}
with {
variant "name as uncapitalized";
......
......@@ -450,7 +450,7 @@ module OneM2M_Testcases_AE {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
......@@ -538,7 +538,7 @@ module OneM2M_Testcases_AE {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_utRequest.to_))) {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
......@@ -630,7 +630,7 @@ module OneM2M_Testcases_AE {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
......@@ -718,7 +718,7 @@ module OneM2M_Testcases_AE {
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_utRequest.to_))) {
[] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
......@@ -957,7 +957,7 @@ module OneM2M_Testcases_AE {
var charstring v_action := __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := mw_deleteRequest;
var template UtTriggerPrimitive v_utRequest := mw_delete;
f_cf03Up();
......@@ -966,7 +966,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_deleteRequest)) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_delete)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
......@@ -1635,7 +1635,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_retrieveResource(p_address))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_retrieve(p_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
......@@ -1685,7 +1685,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
......@@ -1733,7 +1733,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
......@@ -1782,7 +1782,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
......@@ -1831,7 +1831,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_retrieveResource(v_address))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
......@@ -1883,7 +1883,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_delete(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
......@@ -1931,7 +1931,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_delete(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
......@@ -1980,7 +1980,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
......@@ -2029,7 +2029,7 @@ module OneM2M_Testcases_AE {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_deleteRequest(v_address))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
......@@ -2346,7 +2346,7 @@ module OneM2M_Testcases_AE {
//Test behavior
mcaPortIn.send(m_request(m_notifyRequest));
mcaPortIn.send(m_request(m_notify));
tc_ac.start;
alt{
......@@ -2437,7 +2437,7 @@ module OneM2M_Testcases_AE {
//Test behavior
mcaPortIn.send(m_request(m_notifyAggregatedRequest));
mcaPortIn.send(m_request(m_notifyAggregatedNotification));
tc_ac.start;
alt{
......
This diff is collapsed.
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