diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 8af29e1b32c4d24326fe05ced288ef337a90a165..375c1d2870670a12d6a01225a7efea28b918c823 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -401,7 +401,7 @@ module OneM2M_Pixits {
modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar XSD.AnyURI PX_UNREACHABLE_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS_UNREACHABLE}";
- modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
+ modulepar ListOfDuration PX_LOCATION_UPDATE_PERIOD := {"PT10M10S"} ;//10 Minute 10 Seconds
modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
modulepar Labels PX_LABELS := {"VALUE_1"};
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index fc4c24c3263115ebb84173a84256653c33a6fd44..51ed03a0f93e2e0a202270dd27c7d2754a23ee06 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1417,7 +1417,7 @@ module OneM2M_Templates {
primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
};
- template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
+ template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
requestIdentifier := testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
resourceType := int10,
@@ -3558,7 +3558,7 @@ module OneM2M_Templates {
choice := omit //NA
};
- template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) := {
+ template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) := {
resourceName := c_defaultLocationPolicyResourceName, //O
resourceType := omit, //NP
resourceID := omit, //NP
@@ -3573,7 +3573,7 @@ module OneM2M_Templates {
announcedAttribute := omit, //O
locationSource := p_locationSource, //M
locationInformationType := omit,//O
- locationUpdatePeriod := {valueof(p_locationUpdatePeriod)}, //O
+ locationUpdatePeriod := p_locationUpdatePeriod, //O
locationTargetID := p_locationTargetID, //O
locationServer := p_locationServerAddress,//O
locationContainerID := omit, //NP
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 5f620eb16fda1102e82c896a9b3ca1c2a1170647..11cdd56627e14f955de8e2dbedd760ad236c6416 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -6289,7 +6289,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_UNREACHABLE_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;
@@ -6366,7 +6366,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;
@@ -6445,7 +6445,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;
@@ -6527,7 +6527,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;
@@ -6601,7 +6601,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;
@@ -6684,8 +6684,8 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
var integer v_locContainerResourceIndex := -1;
- var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var LocationSource v_locationSource := int1;//Netwok-based
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_locpolicy_request_preamble;
@@ -6757,8 +6757,8 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_LOC_007() runs on AeSimu system CseSystem {
- var integer v_aeAuxIndex := -1;
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var integer v_aeAuxIndex := -1;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var RequestPrimitive v_request;
var MsgIn v_response;
var LocationSource v_locationSource := int2;//Device-based
@@ -6994,7 +6994,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var XSD.Duration locationUpdatePeriod_invalid := c_invalid_location_update_period;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
@@ -7074,10 +7074,10 @@ module OneM2M_Testcases_CSE_Release_3 {
}
function f_CSE_LOC_011() runs on AeSimu {
- var integer v_aeAuxIndex := -1;
- var integer v_locPolicyResourceIndex := -1;
- var integer v_locContainerResourceIndex := -1;
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var integer v_aeAuxIndex := -1;
+ var integer v_locPolicyResourceIndex := -1;
+ var integer v_locContainerResourceIndex := -1;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_loc_request_preamble;
@@ -7152,23 +7152,23 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_LOC_012_01() runs on AeSimu {
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
- var integer v_locContainerResourceIndex := -1;
- var integer v_subscriptionResourceIndex := -1;
- var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
- var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
- var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
- var RequestPrimitive v_locpolicy_request_preamble;
- var RequestPrimitive v_container_request_preamble;
- var RequestPrimitive v_subscription_request_preamble;
- var MsgIn v_response;
-
- //Test component configuration
- f_cf01Up();
+ var integer v_locContainerResourceIndex := -1;
+ var integer v_subscriptionResourceIndex := -1;
+ var LocationSource v_locationSource := int1;//Netwok-based
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
+ var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
+ var RequestPrimitive v_locpolicy_request_preamble;
+ var RequestPrimitive v_container_request_preamble;
+ var RequestPrimitive v_subscription_request_preamble;
+ var MsgIn v_response;
+
+ //Test component configuration
+ f_cf01Up();
- //Preamble - register AE
+ //Preamble - register AE
v_aeAuxIndex := f_cse_preamble_registerAe();
- //Preamble - create a valid locationPolicy resource
+ //Preamble - create a valid locationPolicy resource
v_locpolicy_request_preamble := valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
v_container_request_preamble := valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
@@ -7229,7 +7229,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_locContainerResourceIndex := -1;
var integer v_subscriptionResourceIndex := -1;
var LocationSource v_locationSource := int2;//Device-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var RequestPrimitive v_locpolicy_request_preamble;
var RequestPrimitive v_container_request_preamble;
var RequestPrimitive v_subscription_request_preamble;
@@ -7374,7 +7374,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var RequestPrimitive v_locpolicy_request_preamble;
var MsgIn v_response;
var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
@@ -7438,22 +7438,22 @@ module OneM2M_Testcases_CSE_Release_3 {
}
function f_CSE_LOC_014() runs on AeSimu {
- var integer v_aeAuxIndex := -1;
- var integer v_locPolicyResourceIndex := -1;
- var integer v_locContainerResourceIndex := -1;
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
- var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
- var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
+ var integer v_aeAuxIndex := -1;
+ var integer v_locPolicyResourceIndex := -1;
+ var integer v_locContainerResourceIndex := -1;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
+ var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_loc_request_preamble;
- var RequestPrimitive v_container_request_preamble;
- var MsgIn v_response;
+ var RequestPrimitive v_container_request_preamble;
+ var MsgIn v_response;
var LocationSource v_locationSource := int1;//Network-based
- //Test component configuration
- f_cf01Up();
+ //Test component configuration
+ f_cf01Up();
- //Preamble - register AE
- v_aeAuxIndex := f_cse_preamble_registerAe();
+ //Preamble - register AE
+ v_aeAuxIndex := f_cse_preamble_registerAe();
//Preamble - create a valid locationPolicy resource for later container resource creation
v_loc_request_preamble := valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
v_container_request_preamble := valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
@@ -7512,22 +7512,22 @@ module OneM2M_Testcases_CSE_Release_3 {
}
function f_CSE_LOC_015() runs on AeSimu {
- var integer v_aeAuxIndex := -1;
- var integer v_locPolicyResourceIndex := -1;
+ var integer v_aeAuxIndex := -1;
+ var integer v_locPolicyResourceIndex := -1;
var integer v_locContainerResourceIndex := -1;
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
- var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
- var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
+ var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_loc_request_preamble;
var RequestPrimitive v_container_request_preamble;
var LocationSource v_locationSource := int1;//Network-based
- //Test component configuration
- f_cf01Up();
+ //Test component configuration
+ f_cf01Up();
- //Preamble - register AE
- v_aeAuxIndex := f_cse_preamble_registerAe();
- //Preamble - create a valid locationPolicy resource for later container resource creation
+ //Preamble - register AE
+ v_aeAuxIndex := f_cse_preamble_registerAe();
+ //Preamble - create a valid locationPolicy resource for later container resource creation
v_loc_request_preamble := valueof(m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress));
v_container_request_preamble := valueof(m_createContainer(f_getResourceAddress(v_aeAuxIndex), omit));//no location-container name provided?
v_locPolicyResourceIndex := f_cse_createResource(int10, v_loc_request_preamble, v_aeAuxIndex);//created locationpolicy index
@@ -7535,23 +7535,23 @@ module OneM2M_Testcases_CSE_Release_3 {
//Test Body - retrieve the created container resource
f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex)))));
- tc_ac.start;
- alt{
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value vc_response{
+ tc_ac.start;
+ alt{
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value vc_response{
tc_ac.stop;
- setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ setverdict(fail, __SCOPE__ & "Requested container resource is not found!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource!");
- }
- [] tc_ac.timeout {
+ }
+ [] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource!");
- }
+ }
}
f_checkAeSimuStatus();
@@ -7589,7 +7589,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_locPolicyResourceIndex := -1;
var integer v_locChildResourceIndex := -1;
var LocationSource v_locationSource := int3;//Sharing-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_request;