Manual merge from Release 1 branch:

- Test architecture modification
- Update status of all test cases including those developed for Release 1
- Verification of all test cases groups
- Split in different files for AE and CSE test cases
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent cbca3530
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -5,22 +5,26 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 310 2017-06-23 12:40:44Z reinaortega $
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
module OneM2M_Pics {
/**
* @desc AccessControlPolicy resource support
* @see oneM2M TS-0017 A.5.5.1/1
*/
* @desc AccessControlPolicy resource support
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_CSE_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
} // end of module
......@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 354 2017-08-17 15:06:38Z reinaortega $
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -18,83 +18,106 @@ module OneM2M_Pixits {
group TestAdapterParameters {}
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
group IutParameters {
modulepar boolean PX_MN_CSE := true;
modulepar boolean PX_IN_CSE := false;
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
/**
* @desc IUT CSE Name
*/
modulepar XSD.ID PX_CSE_NAME := "cseName";
/**
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_ID := "/cseId";
/**
* @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
/**
* @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
*/
modulepar XSD.ID PX_SP_ID := "//om2m.org";
/**
* @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
/**
* @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
modulepar ListOfURIs PX_ACOR := {"*"};
}
group TesterParameters {
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
/**
* @desc IUT CSE Name
*/
modulepar XSD.ID PX_CSE_NAME := "cseName";
/**
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_ID := "/cseId";
/**
* @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
*/
modulepar XSD.ID PX_SP_ID := "//om2m.org";
/**
* @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";
/**
* @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
/**
* @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_AE1_ID_STEM := "";
/**
* @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";
/**
* @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_AE1_ID_STEM := "";
/**
* @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_AE2_ID_STEM := "";
/**
* @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
/**
* @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
/**
* @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_AE2_ID_STEM := "";
/**
* @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_APP_ID := "NMyAppId";
/**
* @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_APP_ID := "NMyAppId";
modulepar boolean PX_RUN_POSTAMBLE := true;
}
group ExecutionParameters {
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar ListOfURIs PX_ACOR := {"*"};
modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
modulepar boolean PX_RUN_POSTAMBLE := true;
}
modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
......@@ -102,6 +125,7 @@ module OneM2M_Pixits {
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
modulepar boolean PX_IUT_IS_IN_CSE := false; //default //set it to true when running Share-based location testcases
//constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
......@@ -117,3 +141,4 @@ module OneM2M_Pixits {
modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
} // end of module
......@@ -15,15 +15,15 @@ module OneM2M_Ports {
import from OneM2M_Types all;
/* ***************************************
* oneM2M Ports
* ***************************************
* oneM2M Ports
* ***************************************
*/
/**
* @desc Port to transport oneM2M primitives
* @desc Output MsgOut
* @desc Input MsgIn
* @desc this port is allowed to extend for futher usage
* @desc e.g. extend OneM2MPort to dual-faced port
* @desc e.g. extend OneM2MPort to dual-faced port
*/
type port OneM2MPort message {
in
......@@ -41,5 +41,26 @@ module OneM2M_Ports {
out
AcRequestPrimitive;
}
/**
* @desc Port to exchange information between components
*/
type port InfoPort message {
in
RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
out
RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
}
/**
* @desc Port to transport control commands to Upper Tester Application
*/
type port UpperTesterPort message {
in
UtTriggerAckPrimitive;
out
UtTriggerPrimitive;
}
}//end module
......@@ -84,7 +84,7 @@ module OneM2M_Templates {
* @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive) := {
template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?) := {
primitive := { responsePrimitive := p_responsePrimitive}
};
......@@ -125,6 +125,36 @@ module OneM2M_Templates {
tokenRequestIndicator := omit
};
/**
* @desc Base Receive RETRIEVE request primitive
* @param p_targetResourceAddress Target resource address
*/
template RequestPrimitive mw_retrieveResource(XSD.ID p_targetResourceAddress) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := ?,
requestIdentifier := ?,
resourceType := ?,
primitiveContent := ?,
roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
resultPersistence := *,
resultContent := *,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
};
/**
* @desc RETRIEVE request primitive for a single attribute in To field ("targetResourceAddress#AttributeName")
* @param p_targetResourceAddress Target resource address (including "#AttributeName")
......@@ -333,7 +363,7 @@ module OneM2M_Templates {
operation := int3,
to_ := "NotInitialized",
from_ := "NotInitialized",
requestIdentifier := "m_update" & f_rnd(1, 1000000),
requestIdentifier := "m_update",
resourceType := omit,
primitiveContent:= omit,
roleIDs := omit,
......@@ -355,27 +385,71 @@ module OneM2M_Templates {
tokenRequestIndicator := omit
};
template RequestPrimitive mw_update(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
operation := int3,
to_ := p_to,
from_ := p_from,
requestIdentifier := ?,
resourceType := ?,
primitiveContent:= ?,
roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
resultPersistence := *,
resultContent := *,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
};
/**
* @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}
};
/**
* @desc Reception template for update Ae resource
*/
template RequestPrimitive mw_updateAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int2,
primitiveContent:= {aE := ?}
};
/**
* @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}
};
/**
* @desc Base Reception template for update Container
*/
template RequestPrimitive mw_updateContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int3,
primitiveContent := {container := ?}
};
/**
* @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}
};
......@@ -383,12 +457,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)}
};
......@@ -396,7 +470,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}
};
......@@ -404,7 +478,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}
};
......@@ -412,7 +486,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}
};
......@@ -420,7 +494,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}
};
......@@ -428,7 +502,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}
};
......@@ -439,24 +513,24 @@ 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}
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc(p_appId,p_stemId)}
};
}//end group Update
......@@ -466,7 +540,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,
roleIDs := omit,
......@@ -530,7 +604,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)}
};
......@@ -545,7 +619,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)}
};
......@@ -553,14 +627,14 @@ module OneM2M_Templates {
/**
* @desc Reception template for AE registration
*/
template RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
template RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := ?) modifies mw_create := {
resourceType := int2,
primitiveContent := {aE := ?}
primitiveContent := {aE := p_ae}
};
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)}
};
......@@ -569,14 +643,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)}
};
......@@ -596,7 +670,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)}
};
......@@ -612,7 +686,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}
};
......@@ -622,7 +696,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}
};
......@@ -631,11 +705,19 @@ 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)}
};
/**
* @desc CREATE request primitive for remoteCSE resource
*/
template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
/**
* @desc CREATE request primitive for Container resource wiht no resourceName provided
*/
......@@ -645,7 +727,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)}
};
......@@ -686,7 +768,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}
};
......@@ -701,7 +783,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)}
};
......@@ -714,6 +796,14 @@ module OneM2M_Templates {
primitiveContent := {contentInstanceAnnc := ?}
};
/**
* @desc Reception template for CREATE ContentInstance
*/
template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int4,
primitiveContent := {contentInstance := ?}
};
/**
* @desc Base Reception template for CREATE ContentInstanceAnnc
*/
......@@ -736,7 +826,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
};
......@@ -748,7 +838,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
};
......@@ -773,7 +863,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 (-,-)}
};
......@@ -782,7 +872,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 (-,-)}
};
......@@ -791,7 +881,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 (-, -)}
};
......@@ -816,7 +906,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(-, -, -) }
};
......@@ -825,7 +915,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(-,-,-) }
};
......@@ -842,7 +932,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 (-)}
};
......@@ -850,7 +940,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 ()}
};
......@@ -859,14 +949,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)}
};
......@@ -888,7 +978,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)}
};
......@@ -897,7 +987,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}
};
......@@ -906,18 +996,26 @@ 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)}
};
/**
* @desc Reception template for CREATE Subscription
*/
template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int23,
primitiveContent := {subscription := ?}
};
template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
in template (omit) XSD.String p_name := omit,
in template (value) ListOfURIs p_notificationURI,
......@@ -935,14 +1033,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}
};