diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index a6d6b93cd7f747f091db65ee59321890202aab42..d0cc6e1e98bbbae84bcc6f78dffeabf017f3db5f 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ - * $Id: OneM2M_Functions.ttcn 190 2016-11-30 01:33:55Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 192 2016-11-30 21:52:33Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -959,7 +959,7 @@ module OneM2M_Functions { if(PX_UNSTRUCTURED) { if(p_targetResourceIndex == -1) { - return ""; + return PX_CSE_RESOURCE_ID; } else { return f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource); } diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index 3bea34c143fd741f8a0e230619d2930ee6a45f63..65cfb6546c8b0089fd9620d17dabdc45ac99c17b 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $ - * $Id: OneM2M_Pixits.ttcn 156 2016-11-02 13:35:44Z carres $ + * $Id: OneM2M_Pixits.ttcn 192 2016-11-30 21:52:33Z reinaortega $ * @desc Module containing Pixits for oneM2M * */ @@ -30,7 +30,11 @@ module OneM2M_Pixits { modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols"""; - modulepar XSD.ID PX_CSE_NAME := "in-name"; + modulepar XSD.ID PX_CSE_NAME := "cseName"; + + modulepar XSD.ID PX_CSE_ID := "cseId"; + + modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId"; modulepar XSD.AnyURI PX_URI_CSE := "in-name";//TODO to be deleted @@ -51,8 +55,6 @@ module OneM2M_Pixits { modulepar charstring PX_SERIALIZATION := "XML"; modulepar charstring PX_PROTOCOL_BINDING := "HTTP"; - - modulepar XSD.ID PX_CSE_ID := "in-cse"; modulepar boolean PX_FROM_IS_AE_ID := true; //@Martin