Commit 1f56801f authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Output from oneM2M Plugtests#2 (part 2)

parent f864ecc4
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 97 2016-06-01 15:38:10Z reinaortega $
* $Id: OneM2M_Functions.ttcn 98 2016-06-02 07:34:39Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -70,7 +70,7 @@ module OneM2M_Functions {
if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE)) {
vc_aeAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AE;
if(ispresent(vc_aeAux.aE_ID)){
f_sendAcPrimitive("AE-ID_changed", vc_aeAux.aE_ID);
f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
......@@ -106,7 +106,7 @@ module OneM2M_Functions {
if (PX_RUN_POSTAMBLE) {
if(PX_UNSTRUCTURED)
{
v_request := m_deleteAe("/" & vc_aeAux.aE_ID);
v_request := valueof(m_deleteAe("/" & vc_aeAux.aE_ID));
v_request.from_ := vc_aeAux.aE_ID;
mcaPort.send(m_request(v_request));
} else {
......@@ -131,7 +131,7 @@ module OneM2M_Functions {
if(PX_UNSTRUCTURED)
{
v_request := m_deleteAcp("/" & vc_acpAux.resourceID);
v_request := valueof(m_deleteAcp("/" & vc_acpAux.resourceID));
v_request.from_ := PX_AE_ID_STEM;
mcaPort.send(m_request(v_request));
} else {
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 97 2016-06-01 15:38:10Z reinaortega $
* $Id: OneM2M_Types.ttcn 98 2016-06-02 07:34:39Z reinaortega $
* @desc Test System module for oneM2M
*
*/
......@@ -4411,5 +4411,5 @@ with {
encode "XML";
variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
extension "anytype charstring, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,Container_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid"
extension "anytype charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,Container_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment