diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 8570094c9916a6812285a7ec2e16ffe66ca2bfa2..c2c38c8bac54826e84786229dade38c697a1a64d 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 194 2016-12-01 05:25:09Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 197 2016-12-02 04:58:45Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -406,7 +406,8 @@ module OneM2M_Functions { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly"); - v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent); + f_checkAttributesToBeSaved(int1, v_request, v_response.primitive.responsePrimitive); + v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent); vc_acpAuxIndex := v_acpAuxIndex; vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_acpAuxIndex}; } @@ -533,7 +534,8 @@ module OneM2M_Functions { v_notificationResponse.any_1 := {{Notification := valueof(mw_contentNotificationAllOmit)}}; v_notificationRequest.verificationRequest := true; - v_notificationRequest.creator := p_creator; + //v_notificationRequest.creator := p_creator; TODO To check what address format is to be expected + //Some participants use SP relative UNSTRUCTURED //v_notificationRequest.subscriptionReference := "I Don't know which URI is expected"; // TODO mandatory parameter v_responsePrimitive := valueof(m_responseNotification(v_responseStatusCode,v_notificationResponse));//TODO No PrimitiveContent is expected @@ -546,7 +548,7 @@ module OneM2M_Functions { [] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Notification received"); - //mcaPort.send(m_response(p_responsePrimitive)); + mcaPort.send(m_response(v_responsePrimitive)); } [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_response { tc_ac.stop; @@ -561,7 +563,7 @@ module OneM2M_Functions { } } - mcaPort.send(m_response(v_responsePrimitive)); // TODO have to be deleted + //mcaPort.send(m_response(v_responsePrimitive)); // TODO have to be deleted unmap(self:mcaPort, system:mcaPort); unmap(self:acPort, system:acPort);