From 16a9e3939c99ba02e55e91591d95fcb7b8164e52 Mon Sep 17 00:00:00 2001
From: garciay <yann.garcia@fscom.fr>
Date: Fri, 5 Apr 2019 12:11:10 +0100
Subject: [PATCH] Major Bug fixed 'port.send' not replaced
---
LibOneM2M/OneM2M_Functions.ttcn | 8 ++++---
LibOneM2M/OneM2M_Pixits.ttcn | 34 ++++++++++++++---------------
LibOneM2M/OneM2M_Templates.ttcn | 2 +-
OneM2M_PermutationFunctions.ttcn | 4 ++--
OneM2M_Testcases_CSE_Release_1.ttcn | 4 ++--
5 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 72e344d..890da61 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2744,7 +2744,7 @@ module OneM2M_Functions {
//mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
- vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")))), int16, -1, false);
+ vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mcaPortIn, "")))), int16, -1, false);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start(10.0);
@@ -2843,7 +2843,7 @@ module OneM2M_Functions {
v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;
v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
- v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mcaPortIn, "")};
+ v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")};
v_myResource.cSEBase.cseType := vc_cseType;
v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
@@ -4390,9 +4390,11 @@ module OneM2M_Functions {
* @param p_announcementTargetResource Announcement Target Resource
* @return p_annoucementTargetPoA Announcemenet Target PoA
*/
- function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mcaPortIn, charstring p_announcementTargetResource := "") return charstring {
+ function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
var charstring v_poa;
+ log(">>> f_getCompletePoA: ", p_portDesc);
+
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort)) {
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index bece78a..48ee51f 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -113,12 +113,12 @@ module OneM2M_Pixits {
AE1 := { // AE1 component settings
mcaPort := {
binding := {
- httpBindingDesc := {
- bindingProtocol := e_http,
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
- remotePort := 9011, // SUT CoAP/HTTP port
- localPort := 3131, // Test Adapter client port (for debug purpose only)
+ remotePort := 9010, // SUT CoAP/HTTP port
+ localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := omit
}
}
@@ -127,12 +127,12 @@ module OneM2M_Pixits {
},
mcaPortIn := {
binding := {
- httpBindingDesc := {
- bindingProtocol := e_http,
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
- remotePort := omit,
- localPort := 3141, // Test Adapter listener port (AeSimu acts as server)
+ remotePort := 9010,
+ localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := omit
}
}
@@ -148,7 +148,7 @@ module OneM2M_Pixits {
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
- localPort := 3132, // Test Adapter client port (for debug purpose only)
+ localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := omit
}
}
@@ -162,7 +162,7 @@ module OneM2M_Pixits {
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort := omit,
- localPort := 3142, // Test Adapter listener port (AeSimu acts as server)
+ localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
sutAddress := omit
}
}
@@ -178,7 +178,7 @@ module OneM2M_Pixits {
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9010,
- localPort := 3031,
+ localPort := 3131,
sutAddress := omit
}
}
@@ -192,7 +192,7 @@ module OneM2M_Pixits {
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= omit,
- localPort := 3041,
+ localPort := 3141,
sutAddress := omit
}
}
@@ -206,7 +206,7 @@ module OneM2M_Pixits {
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9011,
- localPort := 4031,
+ localPort := 4131,
sutAddress := omit
}
}
@@ -215,12 +215,12 @@ module OneM2M_Pixits {
},
mccPortIn := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap ,
+ httpBindingDesc := {
+ bindingProtocol := e_http ,
bindingDesc := {
tsAddress := "192.168.56.102",
- remotePort:= omit,
- localPort := 4041,
+ remotePort:= 9011,
+ localPort := 4141,
sutAddress := omit
}
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 60162e3..c62314b 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -4146,7 +4146,7 @@ module OneM2M_Templates {
resourceType := int16,//M
resourceID := PX_CSE1_RESOURCE_ID,//M
pointOfAccess := { p_pointOfAccess }, //O
- cSEBase := PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
+ cSEBase := f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
cSE_ID := PX_CSE1_ID,//M
requestReachability := true//M
};
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 3f4a56f..0fc25c4 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2073,7 +2073,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));
+ f_send(InterfaceIds:e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2119,7 +2119,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
- mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
+ f_send(InterfaceIds:e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index e4a16bf..23afd35 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -2264,7 +2264,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+ f_send(InterfaceIds:e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2558,7 +2558,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+ f_send(InterfaceIds:e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
--
GitLab