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 @@ ...@@ -5,22 +5,26 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved. * All rights reserved.
* *
* @author oneM2M * @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 310 2017-06-23 12:40:44Z reinaortega $ * $Id: OneM2M_Pics.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing Pixits for oneM2M * @desc Module containing Pixits for oneM2M
* *
*/ */
module OneM2M_Pics { module OneM2M_Pics {
/** /**
* @desc AccessControlPolicy resource support * @desc AccessControlPolicy resource support
* @see oneM2M TS-0017 A.5.5.1/1 * @see oneM2M TS-0017 A.5.5.1/1
*/ */
modulepar boolean PICS_ACP_SUPPORT := true; modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true; modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true; modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_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 } // end of module
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved. * All rights reserved.
* *
* @author oneM2M * @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 354 2017-08-17 15:06:38Z reinaortega $ * $Id: OneM2M_Pixits.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing Pixits for oneM2M * @desc Module containing Pixits for oneM2M
* *
*/ */
...@@ -18,83 +18,106 @@ module OneM2M_Pixits { ...@@ -18,83 +18,106 @@ module OneM2M_Pixits {
group TestAdapterParameters {} group TestAdapterParameters {}
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test"; group IutParameters {
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"}; modulepar boolean PX_MN_CSE := true;
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080"; 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 Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
/** */
* @desc IUT CSE Name modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
*/
modulepar XSD.ID PX_CSE_NAME := "cseName"; /**
* @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
/** */
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1 modulepar XSD.ID PX_AE1_ID_STEM := "";
*/
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 AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1 * @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 := ""; 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 * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
*/ */
modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin"; modulepar XSD.ID PX_APP_ID := "NMyAppId";
/**
* @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 APP-ID with App-ID format according to TS-0001-7.2-1
*/ group ExecutionParameters {
modulepar XSD.ID PX_APP_ID := "NMyAppId";
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar boolean PX_RUN_POSTAMBLE := 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; modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
...@@ -102,6 +125,7 @@ module OneM2M_Pixits { ...@@ -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 //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_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_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 //constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
...@@ -117,3 +141,4 @@ module OneM2M_Pixits { ...@@ -117,3 +141,4 @@ module OneM2M_Pixits {
modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4}; modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
} // end of module } // end of module
...@@ -15,15 +15,15 @@ module OneM2M_Ports { ...@@ -15,15 +15,15 @@ module OneM2M_Ports {
import from OneM2M_Types all; import from OneM2M_Types all;
/* *************************************** /* ***************************************
* oneM2M Ports * oneM2M Ports
* *************************************** * ***************************************
*/ */
/** /**
* @desc Port to transport oneM2M primitives * @desc Port to transport oneM2M primitives
* @desc Output MsgOut * @desc Output MsgOut
* @desc Input MsgIn * @desc Input MsgIn
* @desc this port is allowed to extend for futher usage * @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 { type port OneM2MPort message {
in in
...@@ -41,5 +41,26 @@ module OneM2M_Ports { ...@@ -41,5 +41,26 @@ module OneM2M_Ports {
out out
AcRequestPrimitive; 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 }//end module
This diff is collapsed.
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved. * All rights reserved.
* *
* @author oneM2M * @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 340 2017-08-07 12:08:41Z reinaortega $ * $Id: OneM2M_TestSystem.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Test System module for oneM2M * @desc Test System module for oneM2M
* *
*/ */
...@@ -24,6 +24,8 @@ module OneM2M_TestSystem { ...@@ -24,6 +24,8 @@ module OneM2M_TestSystem {
*/ */
type component Tester { type component Tester {
port AdapterControlPort acPort; port AdapterControlPort acPort;
port InfoPort infoPort;
port UpperTesterPort utPort;
//timers //timers
timer tc_ac := PX_TAC; timer tc_ac := PX_TAC;
timer tc_wait; timer tc_wait;
...@@ -31,30 +33,48 @@ module OneM2M_TestSystem { ...@@ -31,30 +33,48 @@ module OneM2M_TestSystem {
var Configurations vc_config; var Configurations vc_config;
var MyResourcesList vc_resourcesList; var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {}; var IntegerList vc_resourcesIndexToBeDeleted := {};
var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE; //var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD; //var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
}
type component CseTester extends Tester {
port OneM2MPort mcaPort;
port OneM2MPort mccPort;
//global variables
var integer vc_aeAuxIndex;//TODO To be removed var integer vc_aeAuxIndex;//TODO To be removed
var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed var integer vc_acpAuxIndex;
var AccessControlPolicy_optional vc_acpAux; var AccessControlPolicy_optional vc_acpAux;
var integer vc_acpAuxIndex := -1; };
type component AeSimu extends Tester {
var AeSimu vc_ae2;
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
//global variables
var PrimitiveContent vc_primitiveContentRetrievedResource;
} var MsgIn vc_request;
var MsgIn vc_response;
var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
var boolean vc_auxiliaryAe2Up := false;
//var AeSimu vc_ae2;
type component AeTester extends Tester { };
type component CseSimu extends Tester {
port OneM2MPort mcaPort; port OneM2MPort mcaPort;
port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
//global variables //global variables
} var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
var integer vc_remoteCseIndex;
var MsgIn vc_request;
var MsgIn vc_response;
};
type component InCseSimu extends CseSimu {}
type component MnCseSimu extends CseSimu {}
type component CseSystem { type component CseSystem {
port OneM2MPort mcaPort; port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
port OneM2MPort mccPort; port OneM2MPort mccPort;
port AdapterControlPort acPort; port AdapterControlPort acPort;
} }
......
...@@ -2942,7 +2942,7 @@ type record CSEBase ...@@ -2942,7 +2942,7 @@ type record CSEBase
AcpType accessControlPolicyIDs optional, AcpType accessControlPolicyIDs optional,
CseTypeID cseType optional, CseTypeID cseType optional,
XSD.ID cSE_ID, XSD.ID cSE_ID,
record of ResourceType supportedResourceType, ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
PoaList pointOfAccess, PoaList pointOfAccess,
XSD.AnyURI nodeLink optional, XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
...@@ -4965,10 +4965,12 @@ with { ...@@ -4965,10 +4965,12 @@ with {
//FIXME To be added //FIXME To be added
type union Representation { type union Representation {
Resource_2 resource, Resource_2 resource,
ResponsePrimitive responsePrimitive ResponsePrimitive responsePrimitive,
XSD.AnyURI uRI
} }
with { with {
variant "name as 'representation'"; variant "name as 'representation'";
variant (uRI) "name as capitalized";
}; };
type record Notification_1 type record Notification_1
...@@ -6521,6 +6523,10 @@ with { ...@@ -6521,6 +6523,10 @@ with {
encode "adapter"; encode "adapter";
} }
type RequestPrimitive UtTriggerPrimitive;
type ResponsePrimitive UtTriggerAckPrimitive;
type record AttributeAux { type record AttributeAux {
XSD.NCName name, XSD.NCName name,
charstring value_ optional charstring value_ optional
...@@ -7745,6 +7751,40 @@ group OptionalResourceTypes { ...@@ -7745,6 +7751,40 @@ group OptionalResourceTypes {
variant (choice.subscription_list[-]) "name as 'subscription'"; variant (choice.subscription_list[-]) "name as 'subscription'";
}; };
type record ServiceSubscribedNode_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
NodeID nodeID optional,
XSD.ID cSE_ID optional,
record of DeviceID deviceIdentifier optional,
ListOfURIs ruleLinks optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (cSE_ID) "name as 'CSE-ID'";
variant (deviceIdentifier) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.subscription_list) "untagged";
variant (choice.subscription_list[-]) "name as 'subscription'";
};
type record StatsCollect_optional type record StatsCollect_optional
{ {
ResourceName resourceName optional, ResourceName resourceName optional,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved. * All rights reserved.
* *
* @author oneM2M * @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 343 2017-08-07 13:34:49Z reinaortega $ * $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Test control module for oneM2M * @desc Test control module for oneM2M
* *
*/ */
...@@ -40,11 +40,9 @@ module OneM2M_TestControl { ...@@ -40,11 +40,9 @@ module OneM2M_TestControl {
execute(TC_CSE_REG_CRE_016_CST()); execute(TC_CSE_REG_CRE_016_CST());
execute(TC_CSE_REG_CRE_016_POA()); execute(TC_CSE_REG_CRE_016_POA());
execute(TC_CSE_REG_CRE_016_NL()); execute(TC_CSE_REG_CRE_016_NL());
execute(TC_CSE_REG_CRE_018());
execute(TC_CSE_REG_CRE_022()); execute(TC_CSE_REG_CRE_022());
execute(TC_CSE_REG_CRE_023()); execute(TC_CSE_REG_CRE_023());
execute(TC_CSE_REG_CRE_025()); execute(TC_CSE_REG_CRE_025());
execute(TC_CSE_REG_CRE_026());
execute(TC_CSE_REG_RET_001()); execute(TC_CSE_REG_RET_001());
execute(TC_CSE_REG_RET_005()); execute(TC_CSE_REG_RET_005());
execute(TC_CSE_REG_RET_008()); execute(TC_CSE_REG_RET_008());
...@@ -352,3 +350,4 @@ module OneM2M_TestControl { ...@@ -352,3 +350,4 @@ module OneM2M_TestControl {
} }
} // end of module } // end of module
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment