From 6a4adf244b50ac05a7c8a5c19fa77f39749c12db Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 12 Sep 2019 15:45:48 +0200
Subject: [PATCH] Improvements for the use of MQTT as protocol binding
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 12 ++++++------
LibOneM2M/OneM2M_Types.ttcn | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index fd6c82d..a83b843 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -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}});
}
}
}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index f1acf5b..d80ce19 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -8908,8 +8908,8 @@ type record CoapBindingDesc {
type record MqttBindingDesc {
ProtocolBindings bindingProtocol (e_mqtt),
BindingDesc bindingDesc,
- charstring hostingCSE_ID,
- charstring credentialId
+ XSD.ID originator,
+ XSD.ID receiver
// TODO To be completed
}
--
GitLab