diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index c5b477b097f7cbf9b2df3191d1d30c54a9e7d01f..12c8283b5b4cb55fa18c20f0470bbb03105be35e 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 310 2017-06-23 12:40:44Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 312 2017-06-27 07:39:17Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -82,6 +82,6 @@ module OneM2M_Pixits {
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};
+ modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
} // end of module
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 4aa613a7e443b64c9895d1d06e9bb9286c0a7522..f2bd8e89b263d9a796690bcf8a6c7126d4a09205 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 308 2017-06-21 09:44:17Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 312 2017-06-27 07:39:17Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -1651,8 +1651,8 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
cseType := omit,//O
pointOfAccess := omit,//O
- cSEBase := "/" & p_cSEBase,//M
- cSE_ID := "/" & p_cSE_ID,//M
+ cSEBase := "/" & valueof(p_cSEBase),//M
+ cSE_ID := "/" & valueof(p_cSE_ID),//M
m2M_Ext_ID := omit,//O
trigger_Recipient_ID := omit,//O
requestReachability := true,//M
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index b8fc6b844cbfbb81ae15b6b1e5bd1e27ecc4bba7..94a4894cab5847751fa5b768af14948db344e095 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 309 2017-06-21 13:08:02Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 314 2017-06-27 09:23:19Z reinaortega $
* @desc OneM2M data types module
*
*/
@@ -6965,7 +6965,7 @@ type record CSEBase_optional
AcpType accessControlPolicyIDs optional,
CseTypeID cseType optional,
XSD.ID cSE_ID optional,
- record of ResourceType supportedResourceType optional,
+ ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
PoaList pointOfAccess optional,
XSD.AnyURI nodeLink optional,
E2eSecInfo e2eSecInfo optional,
@@ -7811,6 +7811,8 @@ group InvalidTypes {
e_nonHierarchical,
e_hierarchical
}
+
+ type record of ResourceType ResourceTypeList_1;
}
}
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 497f1d76f02db70f1ac53bd94ef8ba31d5653eac..5a1250899107b4257e85970bb504302f39f7d681 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 311 2017-06-27 07:31:00Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 314 2017-06-27 09:23:19Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -435,7 +435,7 @@ module OneM2M_Testcases {
function f_CSE_GEN_UPD_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
- var RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -519,7 +519,7 @@ module OneM2M_Testcases {
function f_CSE_GEN_UPD_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
- var RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -1197,7 +1197,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var RequestPrimitive v_createRequestPrimitive := m_createRemoteCSEBase;
+ var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
var ResourceType v_resourceType := int16; //remoteCSE
// Test control
@@ -1241,7 +1241,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var RequestPrimitive v_createRequestPrimitive := m_createRemoteCSEBase;
+ var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
var ResourceType v_resourceType := int16; //remoteCSE
// Test control
@@ -1382,7 +1382,6 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
- var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -1519,7 +1518,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
tc_ac.stop;
- if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType==PX_SRT){
+ if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.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");