Commit 30000a39 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

f_setProtocolBinding to be run on the corresponding component and not on the MTC


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 218b15ea
......@@ -45,7 +45,8 @@ module OneM2M_Functions {
if(p_auxiliaryAe2Required) {
vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
vc_ae2 := AeSimu.create("AE2") alive;
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2);
vc_ae2.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2));
vc_ae2.done;
vc_ae2.start(f_cf01UpAe2());
vc_ae2.done;
}
......@@ -81,7 +82,9 @@ module OneM2M_Functions {
vc_config := e_cf02;
vc_testSystemRole := e_ae;
vc_cse1 := CseSimu.create("CSE1") alive;
f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
vc_cse1.done;
// Map
map(self:mcaPort, system:mcaPort);
......@@ -134,7 +137,8 @@ module OneM2M_Functions {
vc_testSystemRole := e_cse;
vc_cseType := p_cseType;
vc_ae1 := AeSimu.create("AE1") alive;
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
vc_ae1.done;
//Initialization of local CSEBase
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
......
......@@ -5194,7 +5194,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
......@@ -5260,6 +5261,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -7193,7 +7196,9 @@ module OneM2M_PermutationFunctions {
var integer v_remoteCSEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
//TODO var template RequestPrimitive v_remoteCSEAnnc := mw_createAccessControlPolicyAnnc;
// Test control
......@@ -7295,7 +7300,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
// Test control
......@@ -7354,7 +7360,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
......@@ -7413,7 +7420,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
......@@ -7471,7 +7479,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
......@@ -7535,7 +7544,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
......@@ -7592,7 +7602,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
......@@ -7769,7 +7780,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -7836,7 +7848,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -7963,7 +7976,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8006,7 +8020,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8072,7 +8087,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8132,7 +8148,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8255,7 +8272,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8321,7 +8339,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8387,7 +8406,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8452,7 +8472,8 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......@@ -8712,7 +8733,8 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment