diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 59ec0e3e6a676be13c235689719c1ef6180509a9..e55ad77043569bf30c08a982d63c1348167d1d3f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1904,7 +1904,7 @@ module OneM2M_Functions {
var template ListOfURIs v_defaultListOfURIs := {"NotInitialized"};
var template AcpType v_defaultAcpIDs := {"NotInitialized"};
- p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+ p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
if(p_resourceType != int2) {
if(p_resourceType == int16) {
@@ -2029,7 +2029,7 @@ module OneM2M_Functions {
*/
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on Tester return RequestPrimitive {
- p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+ p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
p_request.from_ := f_getOriginator(p_resourceIndex);
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index fba9863c0c923ba1dda92c6d58613ae266b497e4..d3551621706b17402d7fa64177c16a17d589ff22 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -28,7 +28,7 @@ module OneM2M_TestSystem {
port UpperTesterPort utPort;
//timers
timer tc_ac := PX_TAC;
- timer tc_wait;
+ timer tc_wait := PX_TWAIT;
//global variables
var Configurations vc_config;
var MyResourcesList vc_resourcesList;
diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 4596e1f6fb3804b8278cfa8bb62351f361205ca1..c4e32cb38fa0f50cc96811bb62d2720387bd4194 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -14,7 +14,7 @@
module OneM2M_TestControl {
- import from OneM2M_Testcases all;
+ import from OneM2M_Testcases_CSE all;
control {
execute(TC_CSE_GEN_CRE_001_CSR());
@@ -262,11 +262,14 @@ module OneM2M_TestControl {
execute(TC_CSE_GMG_CRE_005());
execute(TC_CSE_GMG_CRE_006());
execute(TC_CSE_GMG_CRE_007());
- execute(TC_CSE_GMG_CRE_008_CRE());
- execute(TC_CSE_GMG_CRE_008_UPD());
- execute(TC_CSE_GMG_CRE_008_RET());
- execute(TC_CSE_GMG_CRE_008_DEL());
- execute(TC_CSE_GMG_CRE_009());
+ execute(TC_CSE_GMG_005_CRE());
+ execute(TC_CSE_GMG_005_UPD());
+ execute(TC_CSE_GMG_005_RET());
+ execute(TC_CSE_GMG_005_DEL());
+ execute(TC_CSE_GMG_006_CRE());
+ execute(TC_CSE_GMG_006_UPD());
+ execute(TC_CSE_GMG_006_RET());
+ execute(TC_CSE_GMG_006_DEL());
execute(TC_CSE_GMG_UPD_001());
execute(TC_CSE_GMG_UPD_002());
execute(TC_CSE_GMG_UPD_003());
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 0e4da3997479f5aa71d07248a77a742ba6332d8a..469af4fcf1976fec296f10ec0f704fd040ba2939 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -15617,7 +15617,7 @@ module OneM2M_Testcases_CSE {
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
- var RequestPrimitive v_containerRequestPrimitive := m_createContainer_noResourceName;
+ var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
v_contentResponse.contentInstance := mw_contentContentInstanceBase;
@@ -16597,7 +16597,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -16713,7 +16713,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -16819,7 +16819,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -16935,7 +16935,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -17046,7 +17046,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -19476,7 +19476,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -19588,7 +19588,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -19685,7 +19685,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "testDomain";
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -19798,7 +19798,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -19888,7 +19888,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;