diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b6170c3abc5dc8ea0338cfe3dfd7c0d3cd7ac7ce..877a099cf5e3e3666aac915beab05096282c11ab 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 299 2017-06-20 12:36:36Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -998,10 +998,10 @@ module OneM2M_Functions {
}
}
- /**
- * @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
- * @param p_requestPrimitive Template request primitive
- * @return Internal resource index of the created resource
+ /**
+ * @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
+ * @param p_requestPrimitive Template request primitive
+ * @return Internal resource index of the created resource
*/
function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on CseTester return integer {
diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index defde0847977b7c182f9bad50d4aa56bc808a90e..0a81828d4123d0edcb590c117917ea7a9688b04e 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -18,6 +18,7 @@ module OneM2M_Pics {
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
+ modulepar boolean PICS_IN_CSE := true;
} // end of module
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 5daac4820f741bd9c492131856efa18840a8bd89..884f5d0e8664e3e21f7007113f4620b4a05ebc27 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 298 2017-06-14 07:11:13Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -79,4 +79,7 @@ module OneM2M_Pixits {
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 PX_SRT := {int1, int2, int3, int4};
+
} // end of module
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index ccea65b56d26a6d1b9de3c99c4b76ac18f04b016..e0cf7cc3eb5058213a431787c9177693aabdf0bd 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 305 2017-06-20 13:56:26Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -367,6 +367,14 @@ module OneM2M_Templates {
primitiveContent:= {group_optional := m_contentUpdateGroup}
};
+ /**
+ * @desc Base UPDATE request primitive for CSEBase resource
+ */
+ template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
+ requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
+ primitiveContent:= {cSEBase_optional := m_contentUpdateCSEBase}
+ };
+
/**
* @desc Base UPDATE request primitive for Schedule resource
*/
@@ -542,11 +550,20 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicy_optional := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
};
- template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
+ /*template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
from_ := PX_SUPER_USER,
requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
primitiveContent := {cSEBase_optional := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
+ };*/
+
+ /**
+ * @desc Base CREATE request primitive for CSEBase resource
+ */
+ template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
+ requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
+ resourceType := int5,
+ primitiveContent := {cSEBase_optional := m_contentCreateCSEBase}
};
@@ -1182,7 +1199,7 @@ module OneM2M_Templates {
accessControlObjectDetails_list := {}
}
- template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
+ /*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
@@ -1202,7 +1219,29 @@ module OneM2M_Templates {
serviceSubscribedAppRule := p_serviceSubscribedAppRule
}}
}
- }
+ }*/
+
+ /**
+ * @desc Base primitiveContent for CREATE operation for CSEBase resource
+ * @param p_name Resource name
+ */
+ template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) XSD.String p_name := c_defaultResourceName):= {
+ resourceName := p_name,//O
+ resourceType := omit,
+ resourceID := omit,
+ parentID := omit,
+ creationTime := omit,
+ lastModifiedTime := omit,
+ labels := omit,
+ accessControlPolicyIDs := omit,
+ cseType := omit,
+ cSE_ID := omit,
+ supportedResourceType := omit,
+ pointOfAccess := omit,
+ nodeLink := omit,
+ e2eSecInfo := omit,
+ choice := omit
+ };
/**
* @desc Base primitiveContent for CREATE operation for Group resource
@@ -1776,7 +1815,7 @@ module OneM2M_Templates {
/**
* @desc Base primitiveContent for CREATE operation for StatConfig resource
- * @param p_primitiveContent Content for the StatConfig
+ * @param p_primitiveConten t Content for the StatConfig
*/
template StatsConfig_optional m_contentCreateStatConfigBase := {
resourceName := c_defaultStatsConfigResourceName, //O
@@ -1943,6 +1982,28 @@ module OneM2M_Templates {
choice := omit//NP
};
+
+ /**
+ * @desc Base primitiveContent for UPDATE operation for CSEBase resource
+ */
+ template (value) CSEBase_optional m_contentUpdateCSEBase := {
+ resourceName := omit,
+ resourceType := omit,
+ resourceID := omit,
+ parentID := omit,
+ creationTime := omit,
+ lastModifiedTime := omit,
+ labels := omit,
+ accessControlPolicyIDs := omit,
+ cseType := omit,
+ cSE_ID := omit,
+ supportedResourceType := omit,
+ pointOfAccess := omit,
+ nodeLink := omit,
+ e2eSecInfo := omit,
+ choice := omit
+
+ };
/**
* @desc Base primitiveContent for UPDATE operation for PollingChannel resource
@@ -2918,6 +2979,28 @@ module OneM2M_Templates {
notificationEventType := ?
}
};
+
+ template CSEBase_optional mw_contentCSEBaseBase := {
+ resourceName := ?,//M
+ resourceType := ?,//M
+ resourceID := ?,//M
+ parentID := ?,//M
+ creationTime := ?,//M
+ lastModifiedTime := ?,//M
+ labels := *,//O
+ accessControlPolicyIDs := *,//O
+ cseType := *,//O
+ cSE_ID := ?,//M
+ supportedResourceType := ?,//M
+ pointOfAccess := ?,//M
+ nodeLink := *,//O
+ e2eSecInfo := *,//O
+ choice := *//O
+ };
+
+ template CSEBase_optional mw_contentCSEBase_rc1 modifies mw_contentCSEBaseBase := {
+ choice := omit //O
+ }
}//end group responseContent
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index bc28985f28291b439a68a4bbf931115c6222150e..6ad683dc20188ee6d4f23874cd557937748daf70 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
- * $Id: OneM2M_TestSystem.ttcn 298 2017-06-14 07:11:13Z reinaortega $
+ * $Id: OneM2M_TestSystem.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Test System module for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index b78a04b9cafdb1fbe2452f088c99820565c458c5..8b88d045c250d15ab8c9ee6af45dde950bc4c703 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 305 2017-06-20 13:56:26Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc OneM2M data types module
*
*/
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 594e25427c1d548fb9dfaf3c9cae95a6ae986a37..a0e809341d6f345d4fa297bdbc2da80903018e9e 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- * $Id: OneM2M_TypesAndValues.ttcn 305 2017-06-20 13:56:26Z reinaortega $
+ * $Id: OneM2M_TypesAndValues.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 33874864f38e599c624cba96c5171e635f37e399..ab0bb047148fb25d8bc63bf2445b3f08e9750004 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 305 2017-06-20 13:56:26Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -470,10 +470,55 @@ module OneM2M_Testcases {
// Tear down
f_cf02Down();
- }
+ } //end TC_CSE_REG_BV_009
group Create{
+ testcase TC_CSE_REG_CRE_BI_001() runs on CseTester system CseSystem {
+
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var ResourceType v_resourceType := int5; //CSEBase
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_request := f_getCreateRequestPrimitive(v_resourceType, m_createCSEBaseBase, v_aeIndex);
+
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": CSEBase creation rejected.");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while creating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while creating CSEBase");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_CRE_BI_001
+
testcase TC_CSE_REG_CRE_BV_011() runs on CseTester system CseSystem {
// Local variables
@@ -656,7 +701,282 @@ module OneM2M_Testcases {
}//end f_CSE_REG_CRE_BV_015
}// end group g_CSE_REG_CRE_BV_015
- }
+ } //end group Create
+
+ group Retrieve{
+
+ testcase TC_CSE_REG_RET_BV_001() runs on CseTester system CseSystem {
+
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var template PrimitiveContent v_contentResponse;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_contentResponse.cSEBase_optional := mw_contentCSEBase_rc1;
+
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Response OK for retrieving");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while retrieving resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_RET_BV_005
+
+ testcase TC_CSE_REG_RET_BV_005() runs on CseTester system CseSystem {
+
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var template PrimitiveContent v_contentResponse;
+
+ // Test control
+ if(not(PICS_IN_CSE)) {
+ setverdict(inconc, testcasename() & ": IUT shall be IN-CSE to run this test case");
+ stop;
+ }
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_contentResponse.cSEBase_optional := mw_contentCSEBase_rc1;
+
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ if (ispresent(v_response.primitive.responsePrimitive.primitiveContent.cSEBase_optional.cseType)){
+ if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase_optional.cseType==int1){
+ setverdict(pass, testcasename() & ": cseType attribute is set to 1 (IN_CSE)");
+ }else{
+ setverdict(fail, testcasename() & ": Error, cseType attribute is set to " & int2str(enum2int(v_response.primitive.responsePrimitive.primitiveContent.cSEBase_optional.cseType)));
+ }
+ }else{
+ setverdict(fail, testcasename() & ": Error, cseType attribute is not present");
+ }
+
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while retrieving resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_RET_BV_005
+
+ testcase TC_CSE_REG_RET_BV_006() runs on CseTester system CseSystem {
+
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var template PrimitiveContent v_contentResponse;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_contentResponse.cSEBase_optional := mw_contentCSEBase_rc1;
+
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+
+ if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase_optional.supportedResourceType==PX_SRT){
+ setverdict(pass, testcasename() & ": supportedResourceTypes attribute is set according to PX_SRT");
+ }else{
+ setverdict(fail, testcasename() & ": supportedResourceTypes attribute is not set according to PX_SRT");
+ }
+
+ if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase_optional.pointOfAccess==PX_POA){
+ setverdict(pass, testcasename() & ": supportedResourceTypes attribute is set according to PX_POA");
+ }else{
+ setverdict(fail, testcasename() & ": supportedResourceTypes attribute is not set according to PX_POA");
+ }
+
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while retrieving resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_RET_BV_006
+
+ } //end group Retrieve
+
+ group Update{
+
+ testcase TC_CSE_REG_UPD_BI_001() runs on CseTester system CseSystem {
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var Labels v_labels_1 := {"VALUE_1"};
+ var template RequestPrimitive v_updateRequest := m_updateCSEBaseBase;
+ const integer c_cseBaseIndex := -1;
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_updateRequest.primitiveContent.cSEBase_optional.labels := v_labels_1;
+ v_request := f_getUpdateRequestPrimitive(int5, c_cseBaseIndex, v_updateRequest);
+
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": CSEBase update rejected.");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while updating CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while updating CSEBase");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_UPD_BI_001
+
+ }// end group Update
+
+ group Delete{
+
+ testcase TC_CSE_REG_DEL_BI_001() runs on CseTester system CseSystem {
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test Body
+ v_request := valueof(m_deleteRequest(f_getResourceAddress()));
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": CSEBase deletion rejected.");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Error while deleting CSEBase with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while deleting CSEBase");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end TC_CSE_REG_DEL_BI_001
+
+ }// end group Delete
}//end Registration
@@ -1320,7 +1640,7 @@ module OneM2M_Testcases {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
- // Test Bodyi
+ // Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int6;//Child resource references
mcaPort.send(m_request(v_request));
@@ -1369,11 +1689,11 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
}
-
+ }
+
}
-
+
testcase TC_CSE_DMR_CRE_BV_001_02() runs on CseTester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -1382,14 +1702,14 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.group_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, m_createAeAux(omit,omit),v_notifyHandler);//Container
- log(v_responsePrimitive);
- if(getverdict == pass){
+ log(v_responsePrimitive);
+ if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.group_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
}
- }
- }
+ }
testcase TC_CSE_DMR_CRE_BV_001_03() runs on CseTester system CseSystem {
// Local variables
@@ -1403,9 +1723,9 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
-
+
}
testcase TC_CSE_DMR_CRE_BV_001_04() runs on CseTester system CseSystem {
@@ -1420,11 +1740,11 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
}
-
+
testcase TC_CSE_DMR_CRE_BV_001_05() runs on CseTester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
@@ -1434,27 +1754,27 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Group
- if(getverdict == pass){
+ if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
}
- }
- }
+ }
testcase TC_CSE_DMR_CRE_BV_001_06() runs on CseTester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
-
+
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, -, v_notifyHandler);//AccessControlPolicy
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
}
@@ -1468,14 +1788,14 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//AccessControlPolicy
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ if(getverdict == pass){
+ if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
}
- }
- }
-
+ }
+
testcase TC_CSE_DMR_CRE_BV_001_08() runs on CseTester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createScheduleBase;
@@ -1488,7 +1808,7 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
}
@@ -1501,14 +1821,14 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.schedule_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Schedule
-
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+
+ if(getverdict == pass){
+ if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
}
- }
- }
+ }
testcase TC_CSE_DMR_CRE_BV_001_10() runs on CseTester system CseSystem {
// Local variables
@@ -1522,9 +1842,9 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
-
+
}
testcase TC_CSE_DMR_CRE_BV_001_11() runs on CseTester system CseSystem {
@@ -1537,13 +1857,13 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.pollingChannel_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int15, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//PollingChannel
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ if(getverdict == pass){
+ if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName)){
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
}
- }
- }
+ }
testcase TC_CSE_DMR_CRE_BV_001_12() runs on CseTester system CseSystem {
// Local variables
@@ -1556,9 +1876,9 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
-
+
}
testcase TC_CSE_DMR_CRE_BV_001_13() runs on CseTester system CseSystem {
@@ -1574,9 +1894,9 @@ module OneM2M_Testcases {
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
}
}
+
+ }
- }
-
testcase TC_CSE_DMR_CRE_BV_001_14() runs on CseTester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -1590,7 +1910,7 @@ module OneM2M_Testcases {
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
}
}
-
+
}
testcase TC_CSE_DMR_CRE_BV_001_15() runs on CseTester system CseSystem {
@@ -1601,12 +1921,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createAcpBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
- setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
- }
- }
+ if(getverdict == pass){
+ if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
+ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
+ }
+ }
+ }
testcase TC_CSE_DMR_CRE_BV_001_16() runs on CseTester system CseSystem {
// Local variables
@@ -1619,7 +1939,7 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
- }
+ }
}
}
@@ -1628,7 +1948,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
-
+
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createGroupBase, v_notifyHandler);//Subscription
if(getverdict == pass){
@@ -1639,7 +1959,7 @@ module OneM2M_Testcases {
}
testcase TC_CSE_DMR_CRE_BV_001_18() runs on CseTester system CseSystem {
- // Local variables
+ // Local variables
var template RequestPrimitive v_createRequest := m_createNodeBase;
var ResponsePrimitive v_responsePrimitive;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
@@ -1798,8 +2118,8 @@ module OneM2M_Testcases {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, v_parentIndex);
- vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_resourceIndex};
- }
+ vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_resourceIndex};
+ }
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, testcasename() & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
@@ -4865,7 +5185,7 @@ module OneM2M_Testcases {
f_CSE_DMR_RET_BV_013(int9, m_createGroupBase, v_contentResponse);//Group
}
-
+
testcase TC_CSE_DMR_RET_BV_013_09() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
@@ -4907,28 +5227,28 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
- //Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
} else { //ResourceType = RemoteCSE
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
- //Test Body
+ // Test Body
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
@@ -5108,7 +5428,7 @@ module OneM2M_Testcases {
f_CSE_DMR_RET_BV_015(int9, m_createGroupBase, v_contentResponse);//Group
}
-
+
testcase TC_CSE_DMR_RET_BV_015_09() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
@@ -5151,26 +5471,26 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
+
// Test adapter configuration
-
+
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
} else {
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
- //Test Body
+ // Test Body
mcaPort.send(m_request(m_retrieveResourceAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
@@ -5197,7 +5517,7 @@ module OneM2M_Testcases {
// Tear down
f_cf02Down();
-
+
}//end f_CSE_DMR_RET_BV_015
} // end g_CSE_DMR_RET_BV_015
@@ -5244,7 +5564,7 @@ module OneM2M_Testcases {
f_CSE_DMR_RET_BV_016(int9, m_createGroupBase, v_contentResponse);//Group
}
-
+
testcase TC_CSE_DMR_RET_BV_016_09() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
@@ -5287,21 +5607,21 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
}else{
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
@@ -5383,7 +5703,7 @@ module OneM2M_Testcases {
f_CSE_DMR_RET_BV_017(int9, m_createGroupBase, v_contentResponse);//Group
}
-
+
testcase TC_CSE_DMR_RET_BV_017_09() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
@@ -5429,27 +5749,27 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
}else{
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
- {"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
+ {"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -5506,7 +5826,7 @@ module OneM2M_Testcases {
f_CSE_DMR_RET_BO_018(int9, m_createGroupBase);//Group
}
-
+
testcase TC_CSE_DMR_RET_BO_018_09() runs on CseTester system CseSystem {
// Local variables
@@ -5537,27 +5857,27 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
}else{
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
+ {"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -5612,8 +5932,8 @@ module OneM2M_Testcases {
// Local variables
f_CSE_DMR_RET_BO_019(int9, m_createGroupBase);//Group
- }
-
+ }
+
testcase TC_CSE_DMR_RET_BO_019_09() runs on CseTester system CseSystem {
// Local variables
@@ -5630,7 +5950,7 @@ module OneM2M_Testcases {
// Local variables
f_CSE_DMR_RET_BO_019(int23, m_createSubscriptionBase);//Subscription
- }
+ }
function f_CSE_DMR_RET_BO_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
@@ -5644,27 +5964,27 @@ module OneM2M_Testcases {
var integer v_ae2Index := -1;
// Test control
-
- //Test component configuration
+
+ // Test component configuration
f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
}else{
v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
+ {"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -10805,7 +11125,7 @@ module OneM2M_Testcases {
} // end group g_CSE_GMG_BV_024
} // end group Group_Managment
-
+
group Discovery {
group g_CSE_DIS_BV_001{