Skip to content
Snippets Groups Projects
Commit 18c200f4 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fix #41 


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 2c861ae8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Pics.ttcn
+ 43
− 11
View file @ 18c200f4
......@@ -18,24 +18,38 @@ module OneM2M_Pics {
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
/**
* @desc Node role
* @see oneM2M TS-0017 A.5.1.2
*/
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_MN_CSE := true;
modulepar boolean PICS_ASN_CSE := true;
/**
* @desc Resource Addressing methods
* @see oneM2M TS-0017 A.5.2.1
*/
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;
group ResourceOptionalAttributes {
//AccessControlPolicy optional attributes
/**
* @desc Optional attributes of AccessControlPolicy resource
* @see oneM2M TS-0017 A.5.7.4
*/
group AccessControlPolicyOptionalAttributes {
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
}
//AE optional attributes
/**
* @desc Optional attributes of AE resource
* @see oneM2M TS-0017 A.5.7.3
*/
group AeOptionalAttributes {
modulepar boolean PICS_AE_LBL := true;
modulepar boolean PICS_AE_APN := true;
......@@ -45,8 +59,11 @@ module OneM2M_Pics {
modulepar boolean PICS_AE_OR := true;
modulepar boolean PICS_AE_ACPI := true;
}
//Container optional attributes
group ContainerOptionalAttributes {
/**
* @desc Optional attributes of Container resource
* @see oneM2M TS-0017 A.5.7.5
*/
group ContainerOptionalAttributes {
modulepar boolean PICS_CNT_ACPI := true;
modulepar boolean PICS_CNT_MNI := true;
modulepar boolean PICS_CNT_MBS := true;
......@@ -58,7 +75,10 @@ module OneM2M_Pics {
modulepar boolean PICS_CNT_LBL := true;
modulepar boolean PICS_CNT_CR := true;
}
//ContentInstance optional attributes
/**
* @desc Optional attributes of ContentInstance resource
* @see oneM2M TS-0017 A.5.7.6
*/
group ContentInstanceOptionalAttributes {
modulepar boolean PICS_CIN_CNF := true;
modulepar boolean PICS_CIN_RN := true;
......@@ -67,19 +87,28 @@ module OneM2M_Pics {
modulepar boolean PICS_CIN_CR := true;
modulepar boolean PICS_CIN_OR := true;
}
//CSEBase optional attributes
/**
* @desc Optional attributes of CSEBase resource
* @see oneM2M TS-0017 A.5.7.1
*/
group CSEBaseOptionalAttributes {
modulepar boolean PICS_CB_CST := true;
modulepar boolean PICS_CB_NL := true;
}
//Group optional attributes
/**
* @desc Optional attributes of group resource
* @see oneM2M TS-0017 A.5.7.8
*/
group GroupOptionalAttributes {
modulepar boolean PICS_GRP_LBL := true;
modulepar boolean PICS_GRP_GN := true;
modulepar boolean PICS_GRP_ACPI := true;
modulepar boolean PICS_GRP_MACP := true;
}
//RemoteCSE optional attributes
/**
* @desc Optional attributes of remoteCSE resource
* @see oneM2M TS-0017 A.5.7.2
*/
group RemoteCSEOptionalAttributes {
modulepar boolean PICS_CSR_LBL := true;
modulepar boolean PICS_CSR_CST := true;
......@@ -89,7 +118,10 @@ module OneM2M_Pics {
modulepar boolean PICS_CSR_ET := true;
modulepar boolean PICS_CSR_RR := true;
}
//Subscription optional attributes
/**
* @desc Optional attributes of AE resource
* @see oneM2M TS-0017 A.5.7.7
*/
group SubscriptionOptionalAttributes {
modulepar boolean PICS_SUB_ACPI := true;
modulepar boolean PICS_SUB_ENC := true;
......
LibOneM2M/OneM2M_Pixits.ttcn
+ 71
− 6
View file @ 18c200f4
......@@ -21,14 +21,29 @@ module OneM2M_Pixits {
group IutParameters {
/**
* @desc IUT CSE IN role
*/
modulepar boolean PX_IN_CSE := true;
/**
* @desc IUT CSE MN role
*/
modulepar boolean PX_MN_CSE := false;
/**
* @desc IUT CSE ASN role
*/
modulepar boolean PX_ASN_CSE:= false;
/**
* @desc IUT IP address and port
*/
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
/**
* @desc IUT Upper Tester interface support
*/
modulepar boolean PX_UT_IMPLEMENTED := false;
/**
......@@ -60,42 +75,86 @@ module OneM2M_Pixits {
* @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 Allowed AE-IDs starting with C
*/
modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C-AllowedAeId"};
/**
* @desc Not allowed AE-IDs starting with C
*/
modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"C-NotAllowedAeId"};
/**
* @desc Allowed AE-IDs starting with S
*/
modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S-AllowedAeId"};
/**
* @desc Not allowed AE-IDs starting with S
*/
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
/**
* @desc Not allowed App-ID
*/
modulepar XSD.ID PX_NOT_ALLOWED_APP_ID := "NotAllowedAppId";
/**
* @desc Addressing method to use during test execution
*/
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
/**
* @desc Primitive scope to use during test execution
*/
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
/**
* @desc Serialization to use during test execution
*/
modulepar charstring PX_SERIALIZATION := "XML";
/**
* @desc Protocolo binding to use during test execution
*/
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
/**
* @desc Namespace composed of "prefix" = "xml namespace" to use during test execution
*/
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
/**
* @desc Character to indicate "all originators" for AccessControlOriginators element
*/
modulepar ListOfURIs PX_ACOR := {"all"};
/**
* @desc Time given for configuring IUT when required (i.e. when UT not implemented)
*/
modulepar float PX_TCONFIG_IUT := 10.0;
}
group TesterParameters {
/**
* @desc AE1 IP address and listening port
*/
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141";
/**
* @desc AE2 IP address and listening port
*/
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142";
/**
* @desc CSE1 IP address and listening port
*/
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:4141";
/**
* @desc Test System CSE1 Name
*/
......@@ -140,8 +199,14 @@ module OneM2M_Pixits {
group ExecutionParameters {
/**
* @desc Resources to be deleted by TC_DELETE_RESOURCES
*/
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
/**
* @desc To enable run postamble (for debugging)
*/
modulepar boolean PX_RUN_POSTAMBLE := true;
}
......
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