diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 1a382a3b55528cec53554fa046b353079469152e..87133a01b5d66e91b2742891c275b067f0d90a5f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1850,6 +1850,8 @@ module OneM2M_Functions {
var template ListOfURIs v_defaultListOfURIs := {"NotInitialized"};
var template AcpType v_defaultAcpIDs := {"NotInitialized"};
+ p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+
if(p_resourceType != int2) {
if(p_resourceType == int16) {
p_request.from_ := f_getOriginator(p_parentIndex, false);
@@ -1973,6 +1975,8 @@ module OneM2M_Functions {
*/
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on Tester return RequestPrimitive {
+ p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+
p_request.from_ := f_getOriginator(p_resourceIndex);
p_request.to_ := f_getResourceAddress(p_resourceIndex);
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 81f95b0ccd6bbac81d553e14e6f0b0e60035386a..05ba96a6c4738110fd2c3d29fff1d9f27018ec14 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -298,7 +298,7 @@ module OneM2M_Templates {
operation := int3,
to_ := "NotInitialized",
from_ := "NotInitialized",
- requestIdentifier := "m_update" & f_rnd(1, 1000000),
+ requestIdentifier := "m_update",
resourceType := omit,
primitiveContent:= omit,
role := omit,
@@ -320,7 +320,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Ae resource
*/
template (value) RequestPrimitive m_updateAeBase modifies m_update:= {
- requestIdentifier := "m_updateAe" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAe",
primitiveContent:= {aE := m_contentUpdateAe}
};
@@ -328,7 +328,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Container resource
*/
template (value) RequestPrimitive m_updateContainerBase modifies m_update:= {
- requestIdentifier := "m_updateContainer" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateContainer",
primitiveContent:= {container := m_contentUpdateContainer}
};
@@ -336,7 +336,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for ContentInstance resource
*/
template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= {
- requestIdentifier := "m_updateContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateContentInstance",
primitiveContent:= {contentInstance := m_contentUpdateContentInstance}
};
@@ -344,12 +344,12 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for AccessControlPolicy resource
*/
template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
- requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAcp",
primitiveContent:= {accessControlPolicy := m_contentUpdateAcp}
};
template (value) RequestPrimitive m_updateAcpPrivileges(in template(omit) SetOfAcrs p_privileges := omit, in template(omit) SetOfAcrs p_selfPrivileges := omit) modifies m_update := {
- requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAcp",
primitiveContent:= {accessControlPolicy := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}
};
@@ -357,7 +357,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Group resource
*/
template (value) RequestPrimitive m_updateGroupBase modifies m_update := {
- requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateGroup",
primitiveContent:= {group_ := m_contentUpdateGroup}
};
@@ -365,7 +365,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
- requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateGroup",
primitiveContent:= {cSEBase := m_contentUpdateCSEBase}
};
@@ -373,7 +373,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
- requestIdentifier := "m_updateSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateSchedule",
primitiveContent:= {schedule := m_contentUpdateSchedule}
};
@@ -381,7 +381,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for PollingChannel resource
*/
template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := {
- requestIdentifier := "m_updatePollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updatePollingChannel",
primitiveContent:= {pollingChannel := m_contentUpdatePollingChannel}
};
@@ -389,7 +389,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Subscription resource
*/
template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := {
- requestIdentifier := "m_updateSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateSubscription",
primitiveContent:= {subscription := m_contentUpdateSubscription}
};
@@ -400,22 +400,22 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
- requestIdentifier := "m_updateNode" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateNode",
primitiveContent:= {node := m_contentUpdateNode}
}
template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
- requestIdentifier := "m_updateRemoteCSEBase" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateRemoteCSEBase",
primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
}
template (value) RequestPrimitive m_updateAE modifies m_update := {
- requestIdentifier := "m_updateAE" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAE",
primitiveContent := {aE := m_contentUpdateAe}
}
template (value) RequestPrimitive m_updateAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_update:= {
- requestIdentifier := testcasename() & "-m_updateAEAnnc" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_updateAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc(p_appId,p_stemId)}
};
@@ -427,7 +427,7 @@ module OneM2M_Templates {
operation := int1,
to_ := "NotInitialized",
from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_create" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_create",
resourceType := omit,
primitiveContent := omit,
role := omit,
@@ -482,7 +482,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_create:= {
to_ := p_to,
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAEAnnc" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)}
};
@@ -497,7 +497,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)}
};
@@ -512,7 +512,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
};
@@ -521,14 +521,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for AccessControlPolicy resource
*/
template (value) RequestPrimitive m_createAcpBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
};
template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
};
@@ -548,7 +548,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for AccessControlPolicy resource (AUX)
*/
template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createAcpAux" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcpAux",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
};
@@ -564,7 +564,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createCSEBase" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createCSEBase",
resourceType := int5,
primitiveContent := {cSEBase := m_contentCreateCSEBase}
};
@@ -574,7 +574,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Container resource
*/
template (value) RequestPrimitive m_createContainerBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
primitiveContent := {container := m_contentCreateContainer}
};
@@ -583,7 +583,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for remoteCSE resource
*/
template (value) RequestPrimitive m_createRemoteCSEBase(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName := c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createRemoteCSE" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createRemoteCSE",
resourceType := int16,
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
@@ -605,7 +605,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
};
@@ -630,7 +630,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Content Instance resource
*/
template (value) RequestPrimitive m_createContentInstanceBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContentInstance",
resourceType := int4,
primitiveContent := {contentInstance := m_contentCreateContentInstance}
};
@@ -645,7 +645,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
to_ := p_parentResourceAddress,
from_ := "admin:admin",
- requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContentInstance",
resourceType := int4,
primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
};
@@ -680,7 +680,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Group resource
*/
template (value) RequestPrimitive m_createGroupBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createGroup",
resourceType := int9,
primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)} //TODO: p_resourceId
};
@@ -692,7 +692,7 @@ module OneM2M_Templates {
in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
- requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createGroup",
resourceType := int9,
primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId
};
@@ -717,7 +717,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for MgmtCmd resource
*/
template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtCmd" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtCmd",
resourceType := int12,
primitiveContent := {mgmtResource := m_contentCreateMgmtCmd (-,-)}
};
@@ -726,7 +726,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for MgmtObj resource
*/
template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtObj",
resourceType := int13,
primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-,-)}
};
@@ -735,7 +735,7 @@ module OneM2M_Templates {
* @desc CREATE request primitive for MgmtObj resource
*/
template (value) RequestPrimitive m_createMgmtObj modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtObj",
resourceType := int13,
primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-, -)}
};
@@ -760,7 +760,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Node resource
*/
template (value) RequestPrimitive m_createNodeBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNode",
resourceType := int14,
primitiveContent := {node := m_contentCreateNode(-, -, -) }
};
@@ -769,7 +769,7 @@ module OneM2M_Templates {
* @desc CREATE request primitive for Node resource
*/
template (value) RequestPrimitive m_createNode modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNode",
resourceType := int14,
primitiveContent := {node := m_contentCreateNode(-,-,-) }
};
@@ -786,7 +786,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for PollingChannel resource
*/
template (value) RequestPrimitive m_createPollingChannelBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createPollingChannel",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentCreatePollingChannel (-)}
};
@@ -794,7 +794,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
to_ := p_parentResourceAddress,
from_ := p_originatorId,
- requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createPollingChannel",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
};
@@ -803,14 +803,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
};
@@ -832,7 +832,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
resourceType := int19,//FIXME Is this the correct value?
primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)}
};
@@ -841,7 +841,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for ServiceSubscribedAppRule Resource
*/
template (value) RequestPrimitive m_createServiceSubscribedAppRuleBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase",
resourceType := int19,
primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRuleBase}
};
@@ -850,14 +850,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Subscription resource
*/
template (value) RequestPrimitive m_createSubscriptionBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
};
@@ -879,14 +879,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Location Policy resource
*/
template (value) RequestPrimitive m_createLocationPolicyBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createLocationPolicy",
resourceType := int10,
primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
};
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) NodeID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000), //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
+ requestIdentifier := testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
resourceType := int10,
primitiveContent := {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
resultContent := int1//default
@@ -909,7 +909,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNotification" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNotification",
primitiveContent := {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
resultContent := int1 //default
@@ -919,7 +919,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Stats Config resource
*/
template (value) RequestPrimitive m_createStatsConfigBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createStatsConfig" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createStatsConfig",
resourceType := int22,
primitiveContent := {statsConfig := m_contentCreateStatsConfigBase}
};
@@ -928,7 +928,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Stats Config resource
*/
template (value) RequestPrimitive m_createStatsCollectBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createStatsCollect" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createStatsCollect",
resourceType := int21,
primitiveContent := {statsCollect := m_contentCreateStatCollectBase}
};
@@ -937,7 +937,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for M2mServiceSubscriptionProfile resource
*/
template (value) RequestPrimitive m_createM2mServiceSubscriptionProfileBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile",
resourceType := int11,
primitiveContent := {m2mServiceSubscriptionProfile := m_contentCreatem2mServiceSubscriptionProfileBase}
};