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
441ced69
Commit
441ced69
authored
Feb 16, 2018
by
Miguel Angel Reina Ortega
Browse files
New parameter added in MsgIn (nullFields) to fix
#20
Signed-off-by:
reinaortega
<
miguelangel.reinaortega@etsi.org
>
parent
fef9f9e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
8 deletions
+16
-8
LibOneM2M/OneM2M_Functions.ttcn
LibOneM2M/OneM2M_Functions.ttcn
+6
-1
LibOneM2M/OneM2M_Templates.ttcn
LibOneM2M/OneM2M_Templates.ttcn
+7
-5
LibOneM2M/OneM2M_Types.ttcn
LibOneM2M/OneM2M_Types.ttcn
+2
-1
OneM2M_Testcases_CSE_Release_1.ttcn
OneM2M_Testcases_CSE_Release_1.ttcn
+1
-1
No files found.
LibOneM2M/OneM2M_Functions.ttcn
View file @
441ced69
...
...
@@ -2199,7 +2199,12 @@ module OneM2M_Functions {
v_response
.
from_
:=
PX_CSE1_ID
;
v_response
.
to_
:=
v_request
.
primitive
.
requestPrimitive
.
from_
;
v_response
.
primitiveContent
:=
vc_localResourcesList
[
v_localResourceIndex
].
resource
;
mccPortIn
.
send
(
m_response
(
v_response
));
if
(
ischosen
(
vc_localResourcesList
[
v_localResourceIndex
].
resource
.
cSEBase
))
{
mccPortIn
.
send
(
m_response
(
v_response
,
{{
"parentID"
,
omit
}}));
}
else
{
mccPortIn
.
send
(
m_response
(
v_response
));
}
}
tc_ac
.
start
(
10.0
);
repeat
;
...
...
LibOneM2M/OneM2M_Templates.ttcn
View file @
441ced69
...
...
@@ -76,16 +76,18 @@ module OneM2M_Templates {
forcedFields
:=
p_forcedFields
};
template
MsgIn
mw_request
(
in
template
(
present
)
RequestPrimitive
p_requestPrimitive
)
:=
{
primitive
:=
{
requestPrimitive
:=
p_requestPrimitive
}
template
MsgIn
mw_request
(
in
template
(
present
)
RequestPrimitive
p_requestPrimitive
,
template
AttributeList_1
p_nullFields
:=
*
)
:=
{
primitive
:=
{
requestPrimitive
:=
p_requestPrimitive
},
nullFields
:=
p_nullFields
};
/**
* @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
template
MsgIn
mw_response
(
in
template
(
present
)
ResponsePrimitive
p_responsePrimitive
:=
?
)
:=
{
primitive
:=
{
responsePrimitive
:=
p_responsePrimitive
}
template
MsgIn
mw_response
(
in
template
(
present
)
ResponsePrimitive
p_responsePrimitive
:=
?
,
template
AttributeList_1
p_nullFields
:=
*
)
:=
{
primitive
:=
{
responsePrimitive
:=
p_responsePrimitive
},
nullFields
:=
p_nullFields
};
}
//end of group primitives
...
...
@@ -3409,7 +3411,7 @@ module OneM2M_Templates {
resourceName
:=
?
,
//M
resourceType
:=
?
,
//M
resourceID
:=
?
,
//M
parentID
:=
?
,
//M
parentID
:=
omit
,
//M
creationTime
:=
?
,
//M
lastModifiedTime
:=
?
,
//M
labels
:=
*
,
//O
...
...
LibOneM2M/OneM2M_Types.ttcn
View file @
441ced69
...
...
@@ -4109,7 +4109,8 @@ module OneM2M_Types {
union
{
RequestPrimitive
requestPrimitive
,
ResponsePrimitive
responsePrimitive
}
primitive
}
primitive
,
AttributeList_1
nullFields
optional
}
with
{
encode
""
...
...
OneM2M_Testcases_CSE_Release_1.ttcn
View file @
441ced69
...
...
@@ -1811,7 +1811,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac
.
start
;
alt
{
[]
mcaPort
.
receive
(
mw_response
(
mw_responsePrimitive
(
int2000
,
v_contentResponse
)))
->
value
v_response
{
[]
mcaPort
.
receive
(
mw_response
(
mw_responsePrimitive
(
int2000
,
v_contentResponse
)
,
{
"parentID"
}
))
->
value
v_response
{
tc_ac
.
stop
;
setverdict
(
pass
,
__SCOPE__
&
": Response OK for retrieving"
);
}
...
...
Miguel Angel Reina Ortega
@reinaortega
mentioned in issue
#24 (closed)
·
Feb 19, 2018
mentioned in issue
#24 (closed)
mentioned in issue #24
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