Commit e3cc4e6d authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'STF531-REG-TCs' into Release1

parents 1ce83c0f 8beda19d
This diff is collapsed.
......@@ -18,7 +18,8 @@ module OneM2M_Pics {
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_MN_CSE := true;
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
......
......@@ -78,10 +78,26 @@ module OneM2M_Pixits {
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
/**
* @desc Test System CSE1 Name
*/
modulepar XSD.ID PX_CSE1_NAME := "CSE1_NAME";
/**
* @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
modulepar XSD.ID PX_CSE1_ID := "/CSE1_ID";
/**
* @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE1_RESOURCE_ID := "CSE1_RESOURCE_ID";
/**
* @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
*/
modulepar XSD.ID PX_SP1_ID := "//onem2m.org";
/**
* @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
......
......@@ -1051,10 +1051,10 @@ module OneM2M_Templates {
discoveryResultType := omit
};
template RequestPrimitive mw_deleteRequest(template XSD.ID p_resourceAddress := ?) := {
template RequestPrimitive mw_deleteRequest(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
operation := int4,
to_ := p_resourceAddress,
from_ := ?,
from_ := p_from,
requestIdentifier := ?,
resourceType := *,
primitiveContent := *,
......@@ -1209,6 +1209,10 @@ module OneM2M_Templates {
cSEBase := p_cSEBase
}
template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
remoteCSE := p_remoteCSE
}
template PrimitiveContent mw_primitiveContent := ?;
/**
......@@ -3715,6 +3719,11 @@ module OneM2M_Templates {
primitiveContent := {subscription := m_contentSubscription}
}
template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
resourceType := int16
}
template (value) UtTriggerPrimitive m_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
operation := int2,
to_ := p_targetResourceAddress,
......
......@@ -62,6 +62,7 @@ module OneM2M_TestSystem {
port OneM2MPort mccPortIn;
//global variables
var MyResourcesList vc_localResourcesList;
var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
var integer vc_remoteCseIndex;
var MsgIn vc_request;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment