Skip to content
Snippets Groups Projects
Commit e496b0d2 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Adjustment of AccessControlRule elements optionality as defined in specs

parent fde37b75
No related branches found
No related tags found
No related merge requests found
......@@ -95,13 +95,13 @@ module OneM2M_Types {
ListOfURIs accessControlOriginators,
AccessControlOperations accessControlOperations,
record of record {
record of ScheduleEntry accessControlWindow_list optional,//TODO It must be optional
record of ScheduleEntry accessControlWindow_list,
record {
record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//TODO It must be optional,
record length(1 .. infinity) of Ipv6 ipv6Addresses optional//TODO It must be optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
} accessControlContexts_list optional //TODO It must be optional
} accessControlContexts_list
}
with {
variant "name as uncapitalized";
......
......@@ -3560,7 +3560,7 @@ module OneM2M_Testcases_CSE {
var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
if(not(PICS_MN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
stop;
......@@ -3718,7 +3718,6 @@ module OneM2M_Testcases_CSE {
*/
testcase TC_CSE_REG_DEL_003() runs on AeSimu system CseSystem {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
// Test control
......@@ -22219,7 +22218,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{omit, omit, { choice := { countryCode := {"ES"}}}}};
v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
......@@ -22316,7 +22315,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{omit, omit, { choice := { countryCode := {"ES"}}}}};
v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
......@@ -22413,7 +22412,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{omit, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}};
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
......@@ -22509,7 +22508,7 @@ module OneM2M_Testcases_CSE {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{omit, {{f_getIpv4Address(PX_AE2_ADDRESS)}, omit}, omit}};
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE2_ADDRESS)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment