diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 8eeb6ff7064cf1595700a454d18395cba6c7e5c6..5ded4dc60570513b13605e4258d7839647c5f592 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3218,7 +3218,6 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//NA M
link := "NotInitialized", //M
stateTag := omit,//OA M
- creator := omit,//NA O
contentInfo := omit,//OA O
contentSize := omit,//OA M
ontologyRef := omit,//OA O
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 7b440031917213052173f291bd3d23dfff4d7863..5aba1ab366582028e67a34e4e73c916d2efb6182 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -303,7 +303,7 @@ module OneM2M_Testcases_CSE_Release_3 {
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
- }
+ }
}
@@ -2009,7 +2009,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+
v_ae1.start(f_CSE_DMR_RET_002());
v_ae1.done;
@@ -7706,7 +7706,7 @@ module OneM2M_Testcases_CSE_Release_3 {
}//end group Subscription_And_Notification
group Security {
-
+
group ESPrim {
group Notify{
@@ -9441,7 +9441,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
v_ae1.done;
- } //end TC_CSE_A NNC_CRE_001
+ } //end TC_CSE_ANNC_CRE_001
} // end group g_CSE_ANNC_CRE_001
group g_CSE_ANNC_CRE_002 {
@@ -9507,22 +9507,22 @@ module OneM2M_Testcases_CSE_Release_3 {
}
} //end group g_CSE_ANNC_CRE_002
- /**
- * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for a CREATE initiating resource announcement)
- *
- */
- testcase TC_CSE_ANNC_CRE_003() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
-
+ /**
+ * @desc Host CSE of original resource removes an announcement target CSE from the announceTo attribute if it does not return successful CREATE response for the announced resource (for a CREATE initiating resource announcement)
+ *
+ */
+ testcase TC_CSE_ANNC_CRE_003() runs on Tester system CseSystem {
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+
v_ae1.start(f_CSE_ANNC_CRE_003());//ContentInstance
- v_ae1.done;
+ v_ae1.done;
+
+ } //end TC_CSE_ANNC_CRE_003
- } //end TC_CSE_ANNC_CRE_003
-
function f_CSE_ANNC_CRE_003() runs on AeSimu system CseSystem {
-
+
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -10042,62 +10042,62 @@ module OneM2M_Testcases_CSE_Release_3 {
*/
testcase TC_CSE_ANNC_RET_001_ACP() runs on Tester system CseSystem {
//Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentAccessControlPolicy(m_contentCreateAcp);
var template RequestPrimitive v_createRequestAnnc := m_createAcpAnncBase;
v_ae1.start(f_CSE_ANNC_RET_001(int1, v_originalResource, v_createRequestAnnc));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_001_CNT() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentContainer(m_contentCreateContainer);
var template RequestPrimitive v_createRequestAnnc := m_createContainerAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_001(int3, v_originalResource, v_createRequestAnnc));//Container
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_001_CIN() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentContentInstance(m_contentCreateContentInstance);
var template RequestPrimitive v_createRequestAnnc := m_createContentInstanceAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_001(int4, v_originalResource, v_createRequestAnnc));//ContentInstance
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_001_GRP() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentGroup(m_contentCreateGroup(1, {"NotInitialized"}, omit, -, -, -, -));
var template RequestPrimitive v_createRequestAnnc := m_createGroupAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_001(int9, v_originalResource, v_createRequestAnnc));//Group
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_001_TS() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentTimeSeries(m_contentCreateTimeSeries);
var template RequestPrimitive v_createRequestAnnc := m_createTimeSeriesAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_001(int29, v_originalResource, v_createRequestAnnc));//TimeSeries
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_001_TSI() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentTimeSeriesInstance(m_contentCreateTimeSeriesInstance);
var template RequestPrimitive v_createRequestAnnc := m_createTimeSeriesInstanceAnnc;
-
+
v_ae1.start(f_CSE_ANNC_RET_001(int30, v_originalResource, v_createRequestAnnc));//TimeSeriesInstance
- v_ae1.done;
+ v_ae1.done;
}
} //end group g_CSE_ANNC_RET_001
@@ -10110,62 +10110,62 @@ module OneM2M_Testcases_CSE_Release_3 {
*/
testcase TC_CSE_ANNC_RET_002_ACP() runs on Tester system CseSystem {
//Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentAccessControlPolicy(m_contentCreateAcp);
var template RequestPrimitive v_createRequestAnnc := m_createAcpAnncBase;
v_ae1.start(f_CSE_ANNC_RET_002(int1, v_originalResource, v_createRequestAnnc));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_002_CNT() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentContainer(m_contentCreateContainer);
var template RequestPrimitive v_createRequestAnnc := m_createContainerAnncBase;
v_ae1.start(f_CSE_ANNC_RET_002(int3, v_originalResource, v_createRequestAnnc));//Container
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_002_CIN() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentContentInstance(m_contentCreateContentInstance);
var template RequestPrimitive v_createRequestAnnc := m_createContentInstanceAnncBase;
v_ae1.start(f_CSE_ANNC_RET_002(int4, v_originalResource, v_createRequestAnnc));//ContentInstance
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_002_GRP() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentGroup(m_contentCreateGroup(1, {"NotInitialized"}, omit, -, -, -, -));
var template RequestPrimitive v_createRequestAnnc := m_createGroupAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_002(int9, v_originalResource, v_createRequestAnnc));//Group
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_002_TS() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentTimeSeries(m_contentCreateTimeSeries);
var template RequestPrimitive v_createRequestAnnc := m_createTimeSeriesAnncBase;
-
+
v_ae1.start(f_CSE_ANNC_RET_002(int29, v_originalResource, v_createRequestAnnc));//TimeSeries
- v_ae1.done;
+ v_ae1.done;
}
testcase TC_CSE_ANNC_RET_002_TSI() runs on Tester system CseSystem {
- //Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ //Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_originalResource := m_primitiveContentTimeSeriesInstance(m_contentCreateTimeSeriesInstance);
var template RequestPrimitive v_createRequestAnnc := m_createTimeSeriesInstanceAnnc;
-
+
v_ae1.start(f_CSE_ANNC_RET_002(int30, v_originalResource, v_createRequestAnnc));//TimeSeriesInstance
- v_ae1.done;
+ v_ae1.done;
}
} //end group g_CSE_ANNC_RET_002
@@ -12774,6 +12774,12 @@ module OneM2M_Testcases_CSE_Release_3 {
}//end group Dynamic_Authorization
+ group InitialServiceProvisioning{
+
+
+
+ }// end group InitialServiceProvisioning
+
}//end group CSE
}