Moved to XSD 1.12.0 + Integration of all tests developed on the master (Release 2) branch

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent a977cd7a
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_AbstractData.ttcn $
* $Id: LibCommon_AbstractData.ttcn 46 2014-01-16 10:23:16Z filatov $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_AbstractData.ttcn $
* $Id: LibCommon_AbstractData.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc A collection of functions for abstract data types which may be
* useful in the implementation of any TTCN-3 test suite.
* @remark End users should be aware that any changes made to the in
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_AbstractData {
......
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_BasicTypesAndValues.ttcn $
* $Id: LibCommon_BasicTypesAndValues.ttcn 53 2014-07-01 13:29:07Z garciay $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_BasicTypesAndValues.ttcn $
* $Id: LibCommon_BasicTypesAndValues.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc A collection of basic type and value definitions which may be
* useful in the implementation of any TTCN-3 test suite. <br><br>
* @remark End users should be aware that any changes made to the in
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_BasicTypesAndValues {
......
/**
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_DataStrings.ttcn $
* $Id: LibCommon_DataStrings.ttcn 61 2016-08-24 13:29:29Z garciay $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_DataStrings.ttcn $
* $Id: LibCommon_DataStrings.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc A collection of data string type and value definitions which
* may be useful in the implementation of any TTCN-3 test
* suite. "Data string" refers to TTCN-3 hexstring, octetstring
......@@ -12,6 +12,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_DataStrings {
......
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Sync.ttcn $
* $Id: LibCommon_Sync.ttcn 46 2014-01-16 10:23:16Z filatov $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Sync.ttcn $
* $Id: LibCommon_Sync.ttcn 66 2017-03-06 09:59:41Z filatov $
* @desc This module implements _one_ generic synchronization mechanism
* for TTCN-3 test cases with one or more test components.
* Key concept is here that one test component acts as a
......@@ -53,6 +53,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_Sync {
......@@ -143,7 +148,11 @@ module LibCommon_Sync {
* @see LibCommon_Sync.ServerSyncComp
* @see LibCommon_Sync.ClientSyncComp
*/
type port SyncPort message { inout SyncCmd }
type port SyncPort message {
inout SyncCmd
} with {
extension "internal"
}
/**
......
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_TextStrings.ttcn $
* $Id: LibCommon_TextStrings.ttcn 46 2014-01-16 10:23:16Z filatov $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_TextStrings.ttcn $
* $Id: LibCommon_TextStrings.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc A collection of text string type and value definitions which
* may be useful in the implementation of any TTCN-3 test
* suite. "Text string" refers to TTCN-3 charstring and universal
......@@ -11,6 +11,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_TextStrings {
......
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Time.ttcn $
* $Id: LibCommon_Time.ttcn 46 2014-01-16 10:23:16Z filatov $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Time.ttcn $
* $Id: LibCommon_Time.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc A collection of time handling functions which may be useful in
* the implementation of any TTCN-3 test suite.
* @remark End users should be aware that any changes made to the in
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_Time {
......
/**
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_VerdictControl.ttcn $
* $Id: LibCommon_VerdictControl.ttcn 46 2014-01-16 10:23:16Z filatov $
* @version $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_VerdictControl.ttcn $
* $Id: LibCommon_VerdictControl.ttcn 64 2016-12-14 15:09:43Z berge $
* @desc Contains generic functions which set test component verdicts
* based on generic function return codes according to established
* test implementation practice. These functions should only be called
......@@ -11,6 +11,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_VerdictControl {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/*
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @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
*/
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;
} // end of module
......@@ -6,8 +6,8 @@
* All rights reserved.
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @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
*
*/
......@@ -16,27 +16,37 @@ module OneM2M_Pixits {
import from XSD all;
import from OneM2M_Types all;
group testAdapterParameters {}
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 := {"/ae_test", "/MyAcp"};
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_TESTER_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols""";
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
modulepar XSD.ID PX_CSE_NAME := "in-name";
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
modulepar XSD.AnyURI PX_URI_CSE := "in-name";//TODO to be deleted
modulepar XSD.ID PX_CSE_NAME := "cseName";
modulepar boolean PX_UNSTRUCTURED := false;
modulepar XSD.ID PX_CSE_ID := "cseId";
modulepar XSD.ID PX_SP_ID := "om2m.org";
modulepar XSD.ID PX_CSE1_ID := "MyCSEId";
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
modulepar XSD.ID PX_AE1_ID_STEM := "";
modulepar XSD.ID PX_AE_ID_STEM := "";
modulepar XSD.ID PX_AE2_ID_STEM := "";
modulepar XSD.ID PX_SUPER_USER := "admin:admin";
......@@ -46,22 +56,21 @@ module OneM2M_Pixits {
modulepar ListOfURIs PX_ACOR := {"*"};
modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative;
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 XSD.ID PX_CSE_ID := "in-cse";
modulepar boolean PX_FROM_IS_AE_ID := true;
//@Martin
modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
//for checking whether the locationPolicy creation request is originated from a ASN-AE
//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
//@Martin
//constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
......@@ -69,8 +78,11 @@ module OneM2M_Pixits {
modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
modulepar Labels LABELS := {"VALUE_1"};
modulepar Labels PX_LABELS := {"VALUE_1"};
modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
modulepar PoaList PX_POA := {""};
modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
} // end of module
/**
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version
* @desc Port modules for oneM2M Test System
*
*/
module OneM2M_Ports {
import from OneM2M_Types all;
/* ***************************************
* 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
*/
type port OneM2MPort message {
in
MsgIn;
out
MsgOut;
};
/**
* @desc Port to transport Adaptor Control primitives
*/
type port AdapterControlPort message {
in
AcResponsePrimitive;
out
AcRequestPrimitive;
}
}//end module
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -6,48 +6,33 @@
* All rights reserved.
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Test System module for oneM2M
*
*/
module OneM2M_TestSystem {
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
import from LibCommon_Time {modulepar all};
import from XSD all;
/* Ports */
/**
* @desc Port to transport oneM2M primitives
*/
type port OneM2MPort message {
in
MsgIn;
out
MsgOut;
}
/**
* @desc Port to transport Adaptor Control primitives
*/
type port AdapterControlPort message {
in
AcResponsePrimitive;
out
AcRequestPrimitive;
}
import from LibCommon_Time all;
import from OneM2M_Ports all;
import from OneM2M_Pixits all;
/* Components */
/* ***************************************
* Test System Components
* ***************************************
*/
type component Tester {
port AdapterControlPort acPort;
//timers
timer tc_ac := PX_TAC;
timer tc_wait;
//global variables
var Configurations vc_config;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {};
var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
}
type component CseTester extends Tester {
......@@ -56,6 +41,7 @@ module OneM2M_TestSystem {
//global variables
var AE_optional vc_aeAux;//TODO To be removed
var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
var AccessControlPolicy_optional vc_acpAux;
var integer vc_acpAuxIndex := -1;
......@@ -80,54 +66,7 @@ module OneM2M_TestSystem {
/* Primitives */
/**
* @desc Type for the oneM2M primitives exchange
* @member primitive oneM2M primitive
* @member host IP Address of the destination
* @member xmlNamespace XML Namespace to be used
* @member protocolBinding Protocol binding to be used
* @member serialization Serialization to be used
* @member nullFields Fields that are to be included in the oneM2M primitive but empty, i.e. <labels></labels>
*/
type record MsgOut {
union {
RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive
} primitive,
charstring host optional,
charstring xmlNamespace optional,
charstring protocolBinding optional,
charstring serialization optional,
AttributeList_1 nullFields optional
}
/**
* @desc Type for the oneM2M primitives exchange
* @member primitive oneM2M primitive
*/
type record MsgIn {
union {
RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive
} primitive
}
type record AcRequestPrimitive {
charstring event,
anytype data
}
with {
encode "adapter";
}
type record AcResponsePrimitive {
charstring event,
anytype data
}
with {
encode "adapter";
}
}// end of module
with {
......
This diff is collapsed.
......@@ -6,23 +6,43 @@
* All rights reserved.
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
module OneM2M_TypesAndValues {
import from XSD all;
import from OneM2M_Types all;
/* Constants */
const charstring c_uri_cse := "/~/in-cse/";
const charstring c_cse_name := "in-cse";
/* Constants */
const XSD.String c_defaultResourceName := "MyResource";
const charstring c_aeAuxName := "MyAe";
const XSD.String c_defaultGroupResourceName := "MyGroupResource";
const XSD.String c_defaultAccessControlPolicyResourceName := "MyAccessControlPolicyResource";
const XSD.String c_defaultScheduleResourceName := "MyScheduleResource";
const XSD.String c_defaultPollingChannelResourceName := "MyPollingChannelResource";
const XSD.String c_defaultSubscriptionResourceName := "MySubscriptionResource";
const XSD.String c_defaultContentInstanceResourceName := "MyContentInstanceResource";
const XSD.String c_defaultContainerResourceName := "MyContainerResource";
const XSD.String c_defaultDeliveryResourceName := "MyDeliveryResource";
const XSD.String c_defaultRemoteCSEResourceName := "MyRemoteCSEResource";
const XSD.String c_defaultMgmtObjResourceName := "MyMgmtObjResource";
const XSD.String c_defaultMgmtCmdResourceName := "MyMgmtCmdResource";
const XSD.String c_defaultAeResourceName := "MyAeResource";
const XSD.String c_defaultLocationPolicyResourceName := "MyLocationPolicyResource";
const XSD.String c_defaultNodeResourceName := "MyNodeResource";
const XSD.String c_defaultNodeID := "MyNodeId";
const XSD.String c_defaultRequestResourceName := "MyRequestResource";
const XSD.String c_defaultStatsConfigResourceName := "MyStatsConfigResource";
const XSD.String c_defaultStatsCollectResourceName := "MyStatsCollectResource";
const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
const XSD.ID c_aeAuxName := "MyAe";
const XSD.String c_acpAuxName := "MyAcp";
const charstring c_invalid_location_update_period := "-PT30M10S" ;//duration set to invalid value (minus value)
const XSD.ID c_resourceShortNameLatest := "la"; //<latest>
const XSD.ID c_resourceShortNameOldest := "ol"; //<oldest>
const XSD.ID c_resourceShortNameFanOutPoint := "fopt"; //<fanOutPoint>
//AccessControlOperations
const XSD.Integer c_C := 1;
......@@ -87,11 +107,7 @@ module OneM2M_TypesAndValues {
const XSD.Integer c_UDNDi := 60;
const XSD.Integer c_CUDNDi := 61;
const XSD.Integer c_RUDNDi := 62;
const XSD.Integer c_CRUDNDi := 63;
const XSD.Integer c_CRUDNDi := 63;
type NhURI ParentID;
type record length(0 .. infinity) of RequestPrimitive RequestPrimitiveList;
type record length(1 .. infinity) of RequestPrimitiveList RequestPrimitiveMatrix;
}
// end of module
......@@ -6,7 +6,7 @@
* All rights reserved.
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* $Id: UsefulTtcn3Types.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Test System module for oneM2M
*
......
......@@ -6,8 +6,8 @@
* All rights reserved.
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 120 2016-09-20 14:48:51Z reinaortega $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Test System module for oneM2M
*
*/
......@@ -53,9 +53,9 @@ type record AnyType
}
with {
variant "XSD:anyType";
//variant "embedValues";
//variant (attr) "anyAttributes";
//variant (elem_list) "anyElement";
variant "embedValues";
variant (attr) "anyAttributes";
variant (elem_list) "anyElement";
};
// String types
......
This diff is collapsed.
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