diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 8719805f381e922aa3fcf38070335af13e2a05d9..49581dd69577ff6c8cc7bf4ee4575619b349a4fe 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -683,7 +683,7 @@ module OneM2M_Functions {
p_ae2Index := f_getResource(vc_ae2);
if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
- p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
+ p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
}
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_responseStatusCode));
}
@@ -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))) {
@@ -1648,7 +1648,6 @@ module OneM2M_Functions {
var MsgIn v_response;
var RequestPrimitive v_request;
- var integer v_resourceIndex := -1;
var integer v_localResourceIndex := -1;
var PrimitiveContent v_remoteCSEResource;
@@ -1661,7 +1660,7 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
+ vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
}
@@ -1680,7 +1679,7 @@ module OneM2M_Functions {
f_checkCseSimuStatus();
- return v_resourceIndex;
+ return vc_remoteCseIndex;
}
@@ -1851,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;
@@ -1979,7 +1978,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_createContainer(?,?))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(?,?))) -> value v_request {
tc_ac.stop;
v_rp := v_request.primitive.requestPrimitive;
@@ -1987,11 +1986,11 @@ module OneM2M_Functions {
v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
if(v_resourceIndex != -1) {
- mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
+ mcaPortIn.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
setverdict(pass, __SCOPE__&":INFO: Container created successfuly");
}
else {
- mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
+ mcaPortIn.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
setverdict(inconc, __SCOPE__&":INFO: Container creation failed");
}
}
@@ -2196,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);
@@ -2499,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;
@@ -2972,7 +2977,7 @@ module OneM2M_Functions {
}
- function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in charstring p_action) runs on Tester {
+ function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester {
if (PX_UT_IMPLEMENTED){
@@ -3380,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 {
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 7f07ab974e04507c3e03f73641f307dc5b5d1559..37260dd6501de00f444b8baea0b63bf97b447d5f 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -83,11 +83,11 @@ module OneM2M_Pixits {
group TesterParameters {
- modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
+ modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141";
- modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
+ modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142";
- modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
+ modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:4141";
/**
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 8292bf8b573a30f46f9b918bde00fb11c46231a8..f195fbf93d472518116880475c4894d5380eb3de 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -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,
roleIDs := omit,
@@ -129,7 +129,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_ := ?,
@@ -160,7 +160,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,
@@ -192,7 +192,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,
@@ -224,7 +224,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,
@@ -259,7 +259,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,
@@ -292,7 +292,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,
@@ -327,7 +327,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,
@@ -1120,7 +1120,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,
roleIDs := omit,
@@ -1142,13 +1142,13 @@ module OneM2M_Templates {
tokenRequestIndicator := 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_ := ?,
requestIdentifier := ?,
- resourceType := *,
- primitiveContent := *,
+ resourceType := omit,
+ primitiveContent := omit,
roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
@@ -1175,11 +1175,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},
roleIDs := omit,
@@ -1204,11 +1204,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}}},
roleIDs := omit,
@@ -1233,12 +1233,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},
roleIDs := *,
originatingTimestamp := *,
@@ -1246,8 +1246,8 @@ module OneM2M_Templates {
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
- resultPersistence := *,
- resultContent := *,
+ resultPersistence := omit,
+ resultContent := omit,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
@@ -1262,37 +1262,15 @@ module OneM2M_Templates {
/**
* @desc Base NOTIFY request primitive
*/
- template RequestPrimitive mw_aggregatedNotifyBase := {
- operation := int5,
- to_ := ?,
- from_ := *,
- requestIdentifier := ?,
- resourceType := *,
- primitiveContent := { aggregatedNotification := ?},
- roleIDs := *,
- originatingTimestamp := *,
- requestExpirationTimestamp := *,
- resultExpirationTimestamp := *,
- operationExecutionTime := *,
- responseType := *,
- resultPersistence := *,
- resultContent := *,
- eventCategory := *,
- deliveryAggregation := *,
- groupRequestIdentifier := *,
- filterCriteria := *,
- discoveryResultType := *,
- tokens := *,
- tokenIDs := *,
- localTokenIDs := *,
- tokenRequestIndicator := *
+ 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}
};
@@ -2055,7 +2033,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
- locationSource := omit, //M
+ locationSource := int1, //M
locationUpdatePeriod := omit, //O
locationTargetID := omit, //O
locationServer := omit,//O
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 61be5d89b5832edfaac0d1812db204b5b18c17e6..54dc9add8f2993e47de744336ce425d7b8a17d5f 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -60,7 +60,7 @@ module OneM2M_TestSystem {
port OneM2MPort mccPortIn;
//global variables
- var MyResourcesList vc_localResourcesList;
+ var MyResourcesList vc_localResourcesList := {};
var AeSimu vc_ae1;//For CF02 when CseSimu is master
var integer vc_remoteCseIndex;
var integer vc_cSEBaseIndex; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index c2529e112f68148313f58dcd7813581838015ce0..0eea7b80f00113425fd8aad7de5fcaea6615e12c 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -77,7 +77,7 @@ module OneM2M_Testcases_AE {
var integer v_resourceIndex := -1;
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -159,7 +159,7 @@ module OneM2M_Testcases_AE {
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var UtTriggerAckPrimitive v_trigger_response;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
//Test Control
@@ -171,14 +171,14 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ v_utRequest.to_ := f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
@@ -251,7 +251,8 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -262,14 +263,15 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -337,7 +339,8 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -347,14 +350,14 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -428,7 +431,8 @@ module OneM2M_Testcases_AE {
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -438,14 +442,15 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
f_sendUtPrimitive(v_utRequestTemplate,v_action);
v_utRequest := valueof(v_utRequestTemplate);
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");
@@ -493,7 +498,7 @@ module OneM2M_Testcases_AE {
stop;
}
- f_AE_GEN_UPD_002(e_spRelative);
+ f_AE_GEN_RET_002(e_spRelative);
}
testcase TC_AE_GEN_RET_002_ABS() runs on CseSimu system AeSystem {
@@ -514,7 +519,8 @@ module OneM2M_Testcases_AE {
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -524,14 +530,15 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
v_utRequest := valueof(v_utRequestTemplate);
f_sendUtPrimitive(v_utRequest,v_action);
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");
@@ -604,7 +611,8 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -614,14 +622,15 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
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");
@@ -689,7 +698,8 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var PrimitiveContent v_localResource;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -699,15 +709,16 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
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");
@@ -751,7 +762,7 @@ module OneM2M_Testcases_AE {
//primitives for mcaPortIn
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
f_cf03Up();
@@ -794,7 +805,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
v_createAe.primitiveContent.aE.resourceName := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -804,7 +815,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
v_createAe.primitiveContent.aE.expirationTime := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -814,7 +825,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
v_createAe.primitiveContent.aE.labels := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -824,7 +835,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
v_createAe.primitiveContent.aE.appName := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -834,7 +845,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED";
v_createAe.primitiveContent.aE.app_ID := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -844,7 +855,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_createAe.primitiveContent.aE.pointOfAccess := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -854,7 +865,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_createAe.primitiveContent.aE.ontologyRef := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -864,7 +875,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_createAe.primitiveContent.aE.nodeLink := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -874,7 +885,7 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
v_utRequest.primitiveContent.aE.requestReachability := true;
v_createAe.primitiveContent.aE.requestReachability := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -884,13 +895,13 @@ module OneM2M_Testcases_AE {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};
v_createAe.primitiveContent.aE.contentSerialization := ?;
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
- function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in charstring p_action) runs on CseSimu {
+ function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in universal charstring p_action) runs on CseSimu {
//primitives for mcaPortIn
var MsgIn v_request;
@@ -943,10 +954,10 @@ module OneM2M_Testcases_AE {
//variables
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
+ var universal 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();
@@ -955,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!");
@@ -996,7 +1007,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container";
f_cf03Up();
@@ -1038,7 +1049,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
//Test component configuration
f_cf03Up();
@@ -1085,7 +1096,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.contentInfo := ?;
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1094,7 +1105,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.resourceName := ?;
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1103,7 +1114,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
v_request.primitiveContent.contentInstance.expirationTime := ?;
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1112,7 +1123,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
v_request.primitiveContent.contentInstance.labels := ?;
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1121,13 +1132,13 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.creator := ?;
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
- function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+ function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var ResponsePrimitive v_responsePrimitive;
@@ -1180,7 +1191,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
v_request.primitiveContent.container.accessControlPolicyIDs := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1189,7 +1200,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_MNI() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
v_request.primitiveContent.container.maxNrOfInstances := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1198,7 +1209,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
v_utRequest.primitiveContent.container.maxByteSize := 1;
v_request.primitiveContent.container.maxByteSize := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1207,7 +1218,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_MIA() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
v_utRequest.primitiveContent.container.maxInstanceAge := 1;
v_request.primitiveContent.container.maxInstanceAge := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1216,7 +1227,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED";
v_request.primitiveContent.container.ontologyRef := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1225,7 +1236,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_RN() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED";
v_request.primitiveContent.container.resourceName := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1234,7 +1245,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_ET() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
v_request.primitiveContent.container.expirationTime := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1243,7 +1254,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_LBL() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
v_request.primitiveContent.container.labels := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1252,13 +1263,13 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_CRE_004_CR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
v_utRequest.primitiveContent.container.creator := "UNINITIALIZED";
v_request.primitiveContent.container.creator := ?;
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
- function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+ function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var ResponsePrimitive v_responsePrimitive;
@@ -1313,7 +1324,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_UPD_001_ET() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
+ var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
@@ -1327,7 +1338,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
+ var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
@@ -1342,7 +1353,7 @@ module OneM2M_Testcases_AE {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
@@ -1356,7 +1367,7 @@ module OneM2M_Testcases_AE {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"};
@@ -1370,7 +1381,7 @@ module OneM2M_Testcases_AE {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef";
@@ -1384,7 +1395,7 @@ module OneM2M_Testcases_AE {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM";
@@ -1397,7 +1408,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_UPD_001_RR() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
v_utRequest.primitiveContent.aE.requestReachability := true;
@@ -1410,7 +1421,7 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};
@@ -1420,7 +1431,7 @@ module OneM2M_Testcases_AE {
f_AE_DMR_UPD_001(v_utRequestTestBody,v_action, v_expectedUpdateRequestAe);
}
- function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu {
+ function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody, in universal charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu {
//primitives for mcaPortIn
var MsgIn v_request;
@@ -1445,19 +1456,19 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
tc_ac.stop;
- setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
+ setverdict(pass, __SCOPE__, " : AE update request is accepted!");
v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
v_modifiedResource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
v_resourceIndex := f_setLocalResource(v_modifiedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
if(v_resourceIndex != -1) {
- mcaPort.send(m_response(m_responsePrimitive_content(int2004, v_request.primitive.requestPrimitive.requestIdentifier, v_modifiedResource)));
+ mcaPortIn.send(m_response(m_responsePrimitive_content(int2004, v_request.primitive.requestPrimitive.requestIdentifier, v_modifiedResource)));
}
//send back responsePrimitive
- mcaPortIn.send(m_response(v_responsePrimitive));
+ //mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) -> value v_request {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : AE registration update request is rejected due to not including the optional attribute!");
+ setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1478,66 +1489,66 @@ module OneM2M_Testcases_AE {
*/
testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
v_request.primitiveContent.container.expirationTime := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
v_request.primitiveContent.container.labels := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
v_request.primitiveContent.container.maxNrOfInstances := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxByteSize := 1;
v_request.primitiveContent.container.maxByteSize := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_MIA() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxInstanceAge := 1;
v_request.primitiveContent.container.maxInstanceAge := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
- function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+ function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var ResponsePrimitive v_responsePrimitive;
@@ -1590,24 +1601,24 @@ module OneM2M_Testcases_AE {
*/
testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
- f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
+ f_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action);
}
testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
- f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
+ f_AE_DMR_RET_001(int2, f_getLocalResourceAddress(v_auxInteger),v_action);
}
testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
- f_AE_DMR_RET_001(int3, f_getResourceAddress(v_auxInteger),v_action);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
+ f_AE_DMR_RET_001(int3, f_getLocalResourceAddress(v_auxInteger),v_action);
}
- function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in charstring p_action) runs on CseSimu {
+ function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in universal charstring p_action) runs on CseSimu {
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED");
@@ -1624,9 +1635,9 @@ 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 ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
+ setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
@@ -1637,7 +1648,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
+ setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1656,14 +1667,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
//Test component configuration
f_cf03Up();
@@ -1674,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!");
@@ -1704,14 +1715,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
//Test component configuration
f_cf03Up();
@@ -1722,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!!");
@@ -1752,14 +1763,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
//Test component configuration
f_cf03Up();
@@ -1771,9 +1782,9 @@ 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 ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
+ setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
@@ -1784,7 +1795,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
+ setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1801,14 +1812,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
//Test component configuration
f_cf03Up();
@@ -1820,9 +1831,9 @@ 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 ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
+ setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
@@ -1833,7 +1844,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
+ setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1854,14 +1865,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
//Test component configuration
f_cf03Up();
@@ -1872,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!!");
@@ -1902,14 +1913,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
//Test component configuration
f_cf03Up();
@@ -1920,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!!");
@@ -1950,14 +1961,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
//Test component configuration
f_cf03Up();
@@ -1969,9 +1980,9 @@ 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 ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
+ setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
@@ -1982,7 +1993,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while deleting ressource !");
+ setverdict(fail, __SCOPE__, " : error while deleting resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -1999,14 +2010,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
- var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
+ var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
//variables
var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
//Test component configuration
f_cf03Up();
@@ -2018,9 +2029,9 @@ 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 ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
+ setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
@@ -2031,7 +2042,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while deleting ressource !");
+ setverdict(fail, __SCOPE__, " : error while deleting resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
@@ -2061,10 +2072,10 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -2106,14 +2117,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?;
@@ -2123,14 +2134,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;
@@ -2140,14 +2151,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.expirationCounter := 1;
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.expirationCounter := ?;
@@ -2157,14 +2168,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.notificationForwardingURI := ?;
@@ -2174,14 +2185,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.notificationContentType := int1;
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.notificationContentType := ?;
@@ -2191,14 +2202,14 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.notificationEventCat.alt_ := ?;
@@ -2208,21 +2219,21 @@ module OneM2M_Testcases_AE {
testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
- var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
v_utRequest.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
- v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+ v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := ?;
v_requestT.primitiveContent.subscription.subscriberURI := ?;
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
- function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+ function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
@@ -2275,10 +2286,10 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -2308,7 +2319,7 @@ module OneM2M_Testcases_AE {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getResourceAddress(-1);
+ v_utRequest.to_ := f_getLocalResourceAddress(-1);
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -2335,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{
@@ -2366,10 +2377,10 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
- var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+ var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -2399,7 +2410,7 @@ module OneM2M_Testcases_AE {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getResourceAddress(-1);
+ v_utRequest.to_ := f_getLocalResourceAddress(-1);
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -2426,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{
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 064aa3501f4e7dad6b9ee70a6fbf0e63942ed355..a7fa112db9515932d66309f2a4856ff171e5eda0 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -337,7 +337,7 @@ module OneM2M_Testcases_CSE {
v_addressingMethod := e_nonHierarchical;
v_primitiveScope := p_primitiveScope;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -429,7 +429,7 @@ module OneM2M_Testcases_CSE {
v_addressingMethod := e_hierarchical;
v_primitiveScope := p_primitiveScope;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));tc_ac.start;
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
tc_ac.stop;
@@ -2536,7 +2536,7 @@ module OneM2M_Testcases_CSE {
// Test Body
v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2614,7 +2614,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2671,7 +2671,7 @@ module OneM2M_Testcases_CSE {
// Test Body
v_contentResponse.aE := mw_contentAeBase;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2802,7 +2802,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2864,7 +2864,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
v_contentResponse.cSEBase.cseType := int1;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2922,7 +2922,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2951,7 +2951,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -3067,7 +3067,7 @@ module OneM2M_Testcases_CSE {
// Preamble
if(PICS_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
- mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -3092,7 +3092,7 @@ module OneM2M_Testcases_CSE {
}
} else if (PICS_MN_CSE){
vc_remoteCseIndex := f_cse_registrationRemoteCse(p_createRequestPrimitive);
- mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -3150,7 +3150,7 @@ module OneM2M_Testcases_CSE {
// Test Body
v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -3230,7 +3230,7 @@ module OneM2M_Testcases_CSE {
tc_ac.start;
alt {
- [] mccPortIn.receive(mw_request(mw_retrieveResource(f_getResourceAddress()))) -> value v_response {
+ [] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress()))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
}
@@ -3274,7 +3274,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- mccPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -3560,7 +3560,7 @@ module OneM2M_Testcases_CSE {
var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
if(not(PICS_MN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
stop;
@@ -3718,7 +3718,6 @@ module OneM2M_Testcases_CSE {
*/
testcase TC_CSE_REG_DEL_003() runs on AeSimu system CseSystem {
//Local variables
- var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
// Test control
@@ -3796,7 +3795,7 @@ module OneM2M_Testcases_CSE {
// Test Body
tc_ac.start;
alt {
- [] mccPortIn.receive(mw_request(mw_deleteRequest( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) {
+ [] mccPortIn.receive(mw_request(mw_delete( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
}
@@ -4379,7 +4378,7 @@ module OneM2M_Testcases_CSE {
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
vc_ae2.done;
v_ae2Index := f_getResource(vc_ae2);
- p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
+ p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
@@ -5391,7 +5390,7 @@ module OneM2M_Testcases_CSE {
v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
v_contentResponse.container := mw_contentContainerBase;
@@ -5974,7 +5973,7 @@ module OneM2M_Testcases_CSE {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"subscriberURI"};
- v_createRequest.primitiveContent.subscription.subscriberURI := "MySubscriberURI";
+ v_createRequest.primitiveContent.subscription.subscriberURI := "NotInitialized";
v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
v_ae1.done;
@@ -6194,7 +6193,7 @@ module OneM2M_Testcases_CSE {
}
//Check currentByteSize
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -7135,7 +7134,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -7207,7 +7206,7 @@ module OneM2M_Testcases_CSE {
v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
}
- mcaPort.send(m_request(m_retrieveResource(v_targetResourceAddress, f_getOriginator(v_aeIndex))));
+ mcaPort.send(m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex))));
tc_ac.start;
alt {
@@ -7327,7 +7326,7 @@ module OneM2M_Testcases_CSE {
f_cse_updateAcpAuxResource(int61); //c_CUDNDi
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -7460,7 +7459,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -7597,7 +7596,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -7740,7 +7739,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
{"pi", "ct"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
@@ -7854,7 +7853,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
{"lbl"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
@@ -7963,7 +7962,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
{"lbl", "at"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
@@ -8018,7 +8017,7 @@ module OneM2M_Testcases_CSE {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -8083,7 +8082,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -8142,7 +8141,7 @@ module OneM2M_Testcases_CSE {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -8186,7 +8185,6 @@ module OneM2M_Testcases_CSE {
var integer v_contentInstanceIndex1 := -1;
var integer v_contentInstanceIndex2 := -1;
var template PrimitiveContent v_contentResponse;
- timer t_contentInstanceCreationGap;
// Test control
// Test component configuration
@@ -8201,8 +8199,8 @@ module OneM2M_Testcases_CSE {
v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
- t_contentInstanceCreationGap.start(1.0);
- t_contentInstanceCreationGap.timeout;
+ f_sleep(1.0);
+
v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
v_contentResponse.contentInstance := mw_contentContentInstanceBase;
@@ -8210,7 +8208,7 @@ module OneM2M_Testcases_CSE {
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -8385,7 +8383,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -8536,7 +8534,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -8703,7 +8701,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- mcaPort.send(m_request(m_retrieveResourceAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -8877,7 +8875,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -9136,7 +9134,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
{"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
@@ -9283,7 +9281,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
{"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
@@ -9426,7 +9424,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
{"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
@@ -9510,7 +9508,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := p_resultContent;
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -9649,7 +9647,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -9793,7 +9791,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int4;//Attributes and child resources
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -9937,7 +9935,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int5;//attributes and child resource references
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -10080,7 +10078,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int6;//Child resource references
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -10223,7 +10221,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int6;//Child resource references
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -11980,7 +11978,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12004,7 +12002,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12028,7 +12026,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12052,7 +12050,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12076,7 +12074,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12100,7 +12098,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_creationTime := "20001231T012345";
+ var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12188,7 +12186,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_CNT_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12214,7 +12212,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12240,7 +12238,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12266,7 +12264,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12292,7 +12290,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12318,7 +12316,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -12431,7 +12429,7 @@ module OneM2M_Testcases_CSE {
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_containerIndex, v_updateRequest);
f_cse_updateResource(v_updateRequest);
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -14764,7 +14762,7 @@ module OneM2M_Testcases_CSE {
*/
testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -14830,7 +14828,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_NOD_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -14898,7 +14896,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -15100,7 +15098,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -15203,7 +15201,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -15903,7 +15901,7 @@ module OneM2M_Testcases_CSE {
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -16014,7 +16012,6 @@ module OneM2M_Testcases_CSE {
var integer v_contentInstanceIndex_1 := -1;
var integer v_contentInstanceIndex_2 := -1;
const ResourceType c_containerResourceType := int3;
- timer t_contentInstanceCreationGap;
// Test control
@@ -16030,8 +16027,7 @@ module OneM2M_Testcases_CSE {
v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
- t_contentInstanceCreationGap.start(1.0);
- t_contentInstanceCreationGap.timeout;
+ f_sleep(1.0);
v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
@@ -16060,7 +16056,7 @@ module OneM2M_Testcases_CSE {
f_checkAeSimuStatus();
- mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
+ mcaPort.send(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
tc_ac.start;
alt {
@@ -16159,7 +16155,6 @@ module OneM2M_Testcases_CSE {
var integer v_contentInstanceIndex_1 := -1;
var integer v_contentInstanceIndex_2 := -1;
const ResourceType c_containerResourceType := int3;
- timer t_contentInstanceCreationGap;
// Test control
@@ -16175,8 +16170,7 @@ module OneM2M_Testcases_CSE {
v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
- t_contentInstanceCreationGap.start(1.0);
- t_contentInstanceCreationGap.timeout;
+ f_sleep(1.0);
v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
@@ -16205,7 +16199,7 @@ module OneM2M_Testcases_CSE {
f_checkAeSimuStatus();
- mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
+ mcaPort.send(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
tc_ac.start;
alt {
@@ -16638,7 +16632,7 @@ module OneM2M_Testcases_CSE {
v_locContainerResourceIndex := f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
//Test Body - retrieve the created container resource
- mcaPort.send(m_request(valueof(m_retrieveResource(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))));
+ mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))));
tc_ac.start;
alt{
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -16839,7 +16833,7 @@ module OneM2M_Testcases_CSE {
v_subscriptionResourceIndex := f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
//Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
- mcaPort.send(m_request(valueof(m_retrieveResource(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+ mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
tc_ac.start;
alt{
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -16902,7 +16896,7 @@ module OneM2M_Testcases_CSE {
v_subscriptionResourceIndex := f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
//Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
- mcaPort.send(m_request(valueof(m_retrieveResource(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+ mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
tc_ac.start;
alt{
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -16964,7 +16958,7 @@ module OneM2M_Testcases_CSE {
v_subscriptionResourceIndex := f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
//Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
- mcaPort.send(m_request(valueof(m_retrieveResource(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+ mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
tc_ac.start;
alt{
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -17095,7 +17089,7 @@ module OneM2M_Testcases_CSE {
v_locPolicyResourceIndex := f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
//Test Body - retrieve the created locationpolicy resource
- mcaPort.send(m_request(valueof(m_retrieveResource(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex)))));
+ mcaPort.send(m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex)))));
tc_ac.start;
alt{
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -17651,7 +17645,7 @@ module OneM2M_Testcases_CSE {
v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest;
// Test Body
- mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+ mcaPort.send(m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -18555,7 +18549,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_GMG_001(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_GMG_001(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_GMG_001_RET
@@ -18672,7 +18666,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_GMG_002(m_retrieveResource("Temporary", "Temporary"), int61));//c_CUDNDi
+ v_ae1.start(f_CSE_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
v_ae1.done;
}//end TC_CSE_GMG_002_RET
@@ -18777,7 +18771,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_GMG_003(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_GMG_003(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_GMG_003_RET
@@ -18894,7 +18888,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_GMG_004(m_retrieveResource("Temporary", "Temporary"), int61));//c_CUDNDi
+ v_ae1.start(f_CSE_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi
v_ae1.done;
}//end TC_CSE_GMG_004_RET
@@ -19006,7 +19000,7 @@ module OneM2M_Testcases_CSE {
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainerBase;
- v_ae1.start(f_CSE_GMG_005(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
v_ae1.done;
}//end TC_CSE_GMG_005_RET
@@ -19133,7 +19127,7 @@ module OneM2M_Testcases_CSE {
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainerBase;
- v_ae1.start(f_CSE_GMG_006(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
v_ae1.done;
}//end TC_CSE_GMG_006_RET
@@ -19268,7 +19262,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
- v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
+ v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -19323,7 +19317,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
//v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
- v_request := valueof(m_retrieveResourceFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
+ v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -19383,7 +19377,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
- v_request := valueof(m_retrieveResourceDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1));
+ v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -19449,7 +19443,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
- v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
+ v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -19500,9 +19494,9 @@ module OneM2M_Testcases_CSE {
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
- v_request := valueof(m_retrieveResourceFilterUsageOption(v_resourceId, f_getOriginator(v_aeIndex), int1));
+ v_request := valueof(m_retrieveFilterUsageOption(v_resourceId, f_getOriginator(v_aeIndex), int1));
} else {
- v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
+ v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
}
mcaPort.send(m_request(v_request));
@@ -19558,7 +19552,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
- v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
+ v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
v_request.filterCriteria.expireBefore := "20171231T012345";
v_request.filterCriteria.expireAfter := "20181231T012345";
mcaPort.send(m_request(v_request));
@@ -20457,7 +20451,7 @@ module OneM2M_Testcases_CSE {
f_checkComponentDoneAndGetVerdict(vc_ae2);
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -20539,7 +20533,7 @@ module OneM2M_Testcases_CSE {
f_checkComponentDoneAndGetVerdict(vc_ae2);
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -21239,6 +21233,142 @@ module OneM2M_Testcases_CSE {
f_cf01Down();
}//end TC_CSE_SEC_ACP_CRE_002
+
+ /**
+ * @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having empty rules
+ *
+ */
+ testcase TC_CSE_SEC_ACP_CRE_003() runs on AeSimu system CseSystem {
+ // Local variables
+ var MsgIn v_response;
+ var integer v_acpIndex := -1;
+ var template PrimitiveContent v_contentResponse;
+ var RequestPrimitive v_createRequest := valueof(m_createAcpBase);
+ const ResourceType c_accessControlPolicyType := int1;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {};
+
+ v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
+ v_contentResponse.accessControlPolicy.privileges.accessControlRule_list := {};
+
+ // Test Body
+ v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
+
+ mcaPort.send(m_request(v_createRequest));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
+ f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
+ v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1, -, -);
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully, but wrong ACP representation");
+ f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
+ v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1, -, -);
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(c_accessControlPolicyType)));
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(c_accessControlPolicyType)));
+ }
+ }
+
+ f_checkAeSimuStatus();
+
+ //Check to see if the resource is present or not
+ if(f_isResourcePresent(v_acpIndex)) {
+ setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+ } else {
+ setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_SEC_ACP_CRE_003
+
+ /**
+ * @desc Check that the IUT responds with an error when the creation of a accessControlPolicy resource with selfPrivileges attribute having empty rules
+ *
+ */
+ testcase TC_CSE_SEC_ACP_CRE_004() runs on AeSimu system CseSystem {
+ // Local variables
+ var MsgIn v_response;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest := valueof(m_createAcpBase);
+ const ResourceType c_accessControlPolicyType := int1;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list := {};
+
+ // Test Body
+ v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
+
+ mcaPort.send(m_request(v_createRequest));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " creation correctly rejected due to empty selfPriviles accessControlRules");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(c_accessControlPolicyType)));
+ f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
+ v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1, -, -);
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(c_accessControlPolicyType)));
+ }
+ }
+
+ f_checkAeSimuStatus();
+
+ //Check to see if the resource is present or not
+ if(f_isResourceNotPresent(-1, v_createRequest.primitiveContent.accessControlPolicy.resourceName)) {
+ setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
+ } else {
+ setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_SEC_ACP_CRE_004
}// end of group Create
@@ -21439,7 +21569,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_001(m_retrieveResource("Temporary", "Temporary")));
+ v_ae1.start(f_CSE_SEC_ACP_001(m_retrieve("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_SEC_ACP_001_RET
@@ -21542,7 +21672,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_002(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_SEC_ACP_002_RET
@@ -21652,7 +21782,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_003(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_SEC_ACP_003(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_SEC_ACP_003_03
@@ -21768,7 +21898,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_004(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_SEC_ACP_004(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_SEC_ACP_004_RET
@@ -21835,6 +21965,587 @@ module OneM2M_Testcases_CSE {
}//end g_CSE_SEC_ACP_004
+ group g_CSE_SEC_ACP_005 {
+
+ /**
+ * @desc Check that the IUT responds successfully when the AE tries an OPERATION on a AE_RESOURCE_TYPE resource and that the request is within accessControlTimeWindow context.
+ *
+ */
+ testcase TC_CSE_SEC_ACP_005_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_005(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_005_CRE
+
+ testcase TC_CSE_SEC_ACP_005_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_005_UPD
+
+ testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_005_RET
+
+ testcase TC_CSE_SEC_ACP_005_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_005(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_005_DEL
+
+ function f_CSE_SEC_ACP_005(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var charstring v_currentTime;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_currentTime := fx_generateTimestamp();
+ v_accessControlRule.accessControlContexts_list := {{{"* * * * * " & f_getYear(v_currentTime)}, omit, omit}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_005
+
+ }//end g_CSE_SEC_ACP_005
+
+ group g_CSE_SEC_ACP_006 {
+
+ /**
+ * @desc Check that the IUT responds with an error when the AE tries an OPERATION on a AE_RESOURCE_TYPE resource out of accessControlTimeWindow context.
+ *
+ */
+ testcase TC_CSE_SEC_ACP_006_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_006(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_006_CRE
+
+ testcase TC_CSE_SEC_ACP_006_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_006_UPD
+
+ testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_006_RET
+
+ testcase TC_CSE_SEC_ACP_006_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_006(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_006_DEL
+
+ function f_CSE_SEC_ACP_006(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_accessControlRule.accessControlContexts_list := {{{"* * * * * 3000"}, omit, omit}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Operation denied due to lack of privileges, out of accessControlTimeWindow");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_006
+
+ }//end g_CSE_SEC_ACP_006
+
+ group g_CSE_SEC_ACP_007 {
+
+ /**
+ * @desc Check that the IUT responds successfully when the AE tries an OPERATION on a AE_RESOURCE_TYPE resource and that the request is within accessControlLocationRegion context.
+ *
+ */
+ testcase TC_CSE_SEC_ACP_007_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_007(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_007_CRE
+
+ testcase TC_CSE_SEC_ACP_007_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_007_UPD
+
+ testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_007_RET
+
+ testcase TC_CSE_SEC_ACP_007_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_007(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_007_DEL
+
+ function f_CSE_SEC_ACP_007(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ //TODO How to indicate the location of the Originator (AE1)?
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_007
+
+ }//end g_CSE_SEC_ACP_007
+
+ group g_CSE_SEC_ACP_008 {
+
+ /**
+ * @desc Check that the IUT responds with an error when the AE tries an OPERATION on a AE_RESOURCE_TYPE resource out of accessControlLocationRegion context
+ *
+ */
+ testcase TC_CSE_SEC_ACP_008_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_008(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_008_CRE
+
+ testcase TC_CSE_SEC_ACP_008_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_008_UPD
+
+ testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_008_RET
+
+ testcase TC_CSE_SEC_ACP_008_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_008(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_008_DEL
+
+ function f_CSE_SEC_ACP_008(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ //TODO How to indicate the location of the Originator (AE1)?
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Operation denied due to lack of privileges, out of accessControlTimeWindow");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_008
+
+ }//end g_CSE_SEC_ACP_008
+
+ group g_CSE_SEC_ACP_009 {
+
+ /**
+ * @desc Check that the IUT responds successfully when the AE tries an OPERATION on a TARGET_RESOURCE_TYPE resource and that the request is within accessControlIpAddresses context.
+ *
+ */
+ testcase TC_CSE_SEC_ACP_009_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_009(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_009_CRE
+
+ testcase TC_CSE_SEC_ACP_009_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_009_UPD
+
+ testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_009_RET
+
+ testcase TC_CSE_SEC_ACP_009_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_009(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_009_DEL
+
+ function f_CSE_SEC_ACP_009(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while operation on resource type int2 (Ae)");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int2 (Ae)");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_009
+
+ }//end g_CSE_SEC_ACP_009
+
+ group g_CSE_SEC_ACP_010 {
+
+ /**
+ * @desc Check that the IUT responds with an error when the AE tries an OPERATION on a AE_RESOURCE_TYPE resource out of accessControlIpAddresses context.
+ *
+ */
+ testcase TC_CSE_SEC_ACP_010_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_010(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_010_CRE
+
+ testcase TC_CSE_SEC_ACP_010_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateAeBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.aE.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_010_UPD
+
+ testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_010_RET
+
+ testcase TC_CSE_SEC_ACP_010_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_010(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_SEC_ACP_010_DEL
+
+ function f_CSE_SEC_ACP_010(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var RequestPrimitive v_createRequest;
+ var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
+ v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE2_ADDRESS)}, omit}, omit}};
+ v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
+ v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
+
+ // Test Body
+ p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Operation denied due to lack of privileges, out of accessControlTimeWindow");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation");
+ }
+ }
+
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+
+ }//end f_CSE_SEC_ACP_010
+
+ }//end g_CSE_SEC_ACP_010
+
+
group g_CSE_SEC_ACP_011 {
/**
@@ -21861,7 +22572,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_011(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.start(f_CSE_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000));
v_ae1.done;
}//end TC_CSE_SEC_ACP_011_RET
@@ -21950,7 +22661,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_SEC_ACP_012(m_retrieveResource("Temporary", "Temporary"), int61));
+ v_ae1.start(f_CSE_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61));
v_ae1.done;
}//end TC_CSE_SEC_ACP_012_RET