Commit 5b21bdbd authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge remote-tracking branch 'remotes/origin/oneM2M-Interop-5' into Release1


Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parents 84c32ea7 aa4b4a1e
...@@ -77,7 +77,7 @@ module OneM2M_Pixits { ...@@ -77,7 +77,7 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols"""; modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
modulepar ListOfURIs PX_ACOR := {"*"}; modulepar ListOfURIs PX_ACOR := {"all"};
} }
......
...@@ -1330,7 +1330,7 @@ module OneM2M_Templates { ...@@ -1330,7 +1330,7 @@ module OneM2M_Templates {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))} accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M },//M
selfPrivileges := { selfPrivileges := {
accessControlRule_list := {valueof(m_createAcr({"*"}, int63))} accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
},//M },//M
choice := omit //NP choice := omit //NP
}; };
......
...@@ -21700,7 +21700,7 @@ module OneM2M_Testcases_CSE { ...@@ -21700,7 +21700,7 @@ module OneM2M_Testcases_CSE {
} }
//Postamble //Postamble
v_accessControlRule_1 := valueof(m_createAcr({"*"}, int63)); v_accessControlRule_1 := valueof(m_createAcr({"all"}, int63));
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1}; v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs)); v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest); v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
......
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