Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
TST
ATS
Commits
1465e51d
Commit
1465e51d
authored
Jan 17, 2020
by
Miguel Angel Reina Ortega
Browse files
Fix
#78
Signed-off-by:
reinaortega
<
miguelangel.reinaortega@etsi.org
>
parent
c4236deb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
16 deletions
+4
-16
OneM2M_PermutationFunctions.ttcn
OneM2M_PermutationFunctions.ttcn
+4
-16
No files found.
OneM2M_PermutationFunctions.ttcn
View file @
1465e51d
...
...
@@ -6502,10 +6502,7 @@ module OneM2M_PermutationFunctions {
var
integer
v_aeIndex
:=
-
1
;
var
integer
v_resourceIndex
:=
-
1
;
var
integer
v_ae2Index
:=
-
1
;
var
AccessControlRule
v_accessControlRule_1
:=
valueof
(
m_createAcr
({
PX_SUPER_AE_ID
},
int63
));
var
AccessControlRule
v_accessControlRule_2
;
var
SetOfAcrs
v_setOfArcs
;
// Test control
if
(
not
(
PICS_ACP_SUPPORT
))
{
setverdict
(
inconc
,
__SCOPE__
&
": AccessControlPolicy support is required to run this test case"
);
...
...
@@ -6518,21 +6515,14 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
v_a
cpAux
Index
:=
f_cse_preamble_
c
re
ateAcpAux
(
-
,
-
);
//c_CR
D
NDi);
v_a
e
Index
:=
f_cse_
p
rea
mble_registerAe
(
{
f_getResourceId
(
vc_resourcesList
[
v_a
cpAux
Index
].
resource
)},
-
);
//c_CR
U
NDi);
v_a
e
Index
:=
f_cse_preamble_re
gisterAe
(
-
,
-
);
//c_CR
U
NDi);
v_a
cpAux
Index
:=
f_cse_
c
rea
teAccessControlPolicyAux
(
-
,
{
f_getResourceId
(
vc_resourcesList
[
v_a
e
Index
].
resource
)},
int55
);
//c_CR
D
NDi);
f_cse_preamble_subscriptionVerification
(
v_ae2Index
,
p_createRequestPrimitive
,
p_resourceType
);
//Update ACP Aux to remove DELETE operation rights to AE, keeping rights of SUPER USER to run postamble
v_accessControlRule_2
:=
valueof
(
m_createAcr
({
f_getResourceId
(
vc_resourcesList
[
v_aeIndex
].
resource
)},
int55
));
v_setOfArcs
.
accessControlRule_list
:=
{
v_accessControlRule_1
,
v_accessControlRule_2
};
v_updateRequest
:=
valueof
(
m_updateAcpPrivileges
(
v_setOfArcs
,
-
));
f_cse_updateResource
(
int1
,
vc_acpAuxIndex
,
v_updateRequest
);
//Adjustments for ACP resource type
if
(
p_resourceType
==
int1
)
{
p_createRequestPrimitive
.
primitiveContent
.
accessControlPolicy
.
selfPrivileges
.
accessControlRule_list
:=
{
v_accessControlRule_2
};
//{v_accessControlRule_1,v_accessControlRule_2
};
p_createRequestPrimitive
.
primitiveContent
.
accessControlPolicy
.
selfPrivileges
.
accessControlRule_list
:=
{
m_createAcr
({
f_getResourceId
(
vc_resourcesList
[
v_aeIndex
].
resource
)},
int55
)
};
}
else
{
p_createRequestPrimitive
:=
f_setAcpId
(
p_createRequestPrimitive
,
{
f_getResourceId
(
vc_resourcesList
[
v_acpAuxIndex
].
resource
)});
}
...
...
@@ -6574,8 +6564,6 @@ module OneM2M_PermutationFunctions {
}
// Postamble
// We are forced to delete the Ae because the delete request in the postamble_deleteResources is sent by Ae itself, witch doesn't have privileges
f_cse_deleteResource
(
v_aeIndex
,
m_delete
(
f_getResourceAddress
(
v_aeIndex
),
f_getOriginator
()));
//Use of PX_SUPER_AE_ID to remove AE
f_cse_postamble_deleteResources
();
// Tear down
...
...
Miguel Angel Reina Ortega
@reinaortega
mentioned in commit
95d81d07
·
Jan 28, 2020
mentioned in commit
95d81d07
mentioned in commit 95d81d07d902fce3599a1f9210e6930cb1cee58a
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment