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
6a4adf24
Commit
6a4adf24
authored
Sep 12, 2019
by
Miguel Angel Reina Ortega
Browse files
Improvements for the use of MQTT as protocol binding
Signed-off-by:
reinaortega
<
miguelangel.reinaortega@etsi.org
>
parent
97b317e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
LibOneM2M/OneM2M_Functions.ttcn
LibOneM2M/OneM2M_Functions.ttcn
+6
-6
LibOneM2M/OneM2M_Types.ttcn
LibOneM2M/OneM2M_Types.ttcn
+2
-2
No files found.
LibOneM2M/OneM2M_Functions.ttcn
View file @
6a4adf24
...
...
@@ -5509,20 +5509,20 @@ module OneM2M_Functions {
v_spRelativeAeIdForMqtt
:=
f_getSpRelativeAeIdForMqtt
(
v_aeResourceAddress
);
}
if
((
vc_config
==
e_cf01
)
or
((
vc_config
==
e_cf02
)
and
(
vc_testSystemRole
==
e_ae
))
or
(
vc_config
==
e_cf03
))
{
if
((
vc_config
==
e_cf01
)
or
((
(
vc_config
==
e_cf02
)
or
(
vc_config
==
e_cf02CseSimuMaster
))
and
(
vc_testSystemRole
==
e_ae
))
or
(
vc_config
==
e_cf03
))
{
if
(
vc_myInterfaces
[
enum2int
(
valueof
(
InterfaceIds
:
e_mca_port
))].
myProtocolBinding
==
"MQTT"
)
{
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
&
"_mcaPort"
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
}
if
(
vc_myInterfaces
[
enum2int
(
valueof
(
InterfaceIds
:
e_mca_in_port
))].
myProtocolBinding
==
"MQTT"
)
{
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
&
"_mcaPortIn"
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
}
}
if
(((
vc_config
==
e_cf02
)
and
(
vc_testSystemRole
==
e_cse
))
or
(
vc_config
==
e_cf04
))
{
if
(((
(
vc_config
==
e_cf02
)
or
(
vc_config
==
e_cf02CseSimuMaster
))
and
(
vc_testSystemRole
==
e_cse
))
or
(
vc_config
==
e_cf04
))
{
if
(
vc_myInterfaces
[
enum2int
(
valueof
(
InterfaceIds
:
e_mcc_port
))].
myProtocolBinding
==
"MQTT"
)
{
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
&
"_mccPort"
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
}
if
(
vc_myInterfaces
[
enum2int
(
valueof
(
InterfaceIds
:
e_mcc_in_port
))].
myProtocolBinding
==
"MQTT"
)
{
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
acPort
.
send
(
AcRequestPrimitive
:
{
p_event
&
"_mccPortIn"
,
{
charstring
:=
v_spRelativeAeIdForMqtt
}});
}
}
}
...
...
LibOneM2M/OneM2M_Types.ttcn
View file @
6a4adf24
...
...
@@ -8908,8 +8908,8 @@ type record CoapBindingDesc {
type
record
MqttBindingDesc
{
ProtocolBindings
bindingProtocol
(
e_mqtt
),
BindingDesc
bindingDesc
,
charstring
hostingCSE_ID
,
charstring
c
re
dentialId
XSD
.
ID
originator
,
XSD
.
ID
re
ceiver
// TODO To be completed
}
...
...
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