Commit 48f42447 authored by Yann Garcia's avatar Yann Garcia
Browse files

Reorganize Test System PIXIT PX_TS_SETTINGS.

parent 36c1b68e
This diff is collapsed.
...@@ -109,127 +109,125 @@ module OneM2M_Pixits { ...@@ -109,127 +109,125 @@ module OneM2M_Pixits {
/** /**
* @desc Test System settings * @desc Test System settings
*/ */
modulepar TestSystemSettingsDesc PX_TS_SETTINGS := { modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
AE1 := { // AE1 component settings mcaPort := {
mcaPort := { binding := {
binding := { coapBindingDesc := {
coapBindingDesc := {
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103"
}
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
coapBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_coap,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "192.168.56.102",
remotePort := 9010, remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3041, // Test Adapter listener port (AeSimu acts as server) localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103" sutAddress := "192.168.56.103"
} }
} }
}, },
serialization := e_xml serialization := e_xml
}
}, },
AE2 := { // AE2 component settings mcaPortIn := {
mcaPort := { binding := {
binding := { coapBindingDesc := {
coapBindingDesc := { bindingProtocol := e_coap,
bindingProtocol := e_coap, bindingDesc := {
bindingDesc := { tsAddress := "192.168.56.102",
tsAddress := "192.168.56.102", remotePort := 9010,
remotePort := 9010, // SUT CoAP/HTTP port localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
localPort := 3032, // Test Adapter client port (for debug purpose only) sutAddress := "192.168.56.103"
sutAddress := "192.168.56.103"
}
} }
}, }
serialization := e_xml
}, },
mcaPortIn := { serialization := e_xml
binding := { }
coapBindingDesc := { };
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
mcaPort := {
binding := {
coapBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_coap,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "192.168.56.102",
remotePort := omit, remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3042, // Test Adapter listener port (AeSimu acts as server) localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103" sutAddress := "192.168.56.103"
} }
} }
}, },
serialization := e_xml serialization := e_xml
}
}, },
CSE1 := { // CSE1 component settings mcaPortIn := {
mcaPort := { binding := {
binding := { coapBindingDesc := {
coapBindingDesc := { bindingProtocol := e_coap,
bindingProtocol := e_coap, bindingDesc := {
bindingDesc := { tsAddress := "192.168.56.102",
tsAddress := "192.168.56.102", remotePort := omit,
remotePort:= 9010, localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
localPort := 3131, sutAddress := "192.168.56.103"
sutAddress := "192.168.56.103"
}
} }
}, }
serialization := e_xml
}, },
mcaPortIn := { serialization := e_xml
binding := { }
coapBindingDesc := { };
bindingProtocol := e_coap, modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
bindingDesc := { mcaPort := {
tsAddress := "192.168.56.102", binding := {
remotePort:= omit, coapBindingDesc := {
localPort := 3141, bindingProtocol := e_coap,
sutAddress := "192.168.56.103" bindingDesc := {
} tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3131,
sutAddress := "192.168.56.103"
} }
}, }
serialization := e_xml
}, },
mccPort := { serialization := e_xml
binding := { },
httpBindingDesc := { mcaPortIn := {
bindingProtocol := e_http, binding := {
bindingDesc := { coapBindingDesc := {
tsAddress := "192.168.56.102", bindingProtocol := e_coap,
remotePort:= 9011, bindingDesc := {
localPort := 4131, tsAddress := "192.168.56.102",
sutAddress := "192.168.56.103" remotePort:= omit,
} localPort := 3141,
sutAddress := "192.168.56.103"
} }
}, }
serialization := e_xml
}, },
mccPortIn := { serialization := e_xml
binding := { },
httpBindingDesc := { mccPort := {
bindingProtocol := e_http , binding := {
bindingDesc := { httpBindingDesc := {
tsAddress := "192.168.56.102", bindingProtocol := e_http,
remotePort:= 9011, bindingDesc := {
localPort := 4141, tsAddress := "192.168.56.102",
sutAddress := "192.168.56.103" remotePort:= 9011,
} localPort := 4131,
sutAddress := "192.168.56.103"
} }
}, }
serialization := e_xml },
} serialization := e_xml
}, },
UT := omit mccPortIn := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http ,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4141,
sutAddress := "192.168.56.103"
}
}
},
serialization := e_xml
}
}; };
modulepar UtDesc PX_TS_UT := { url := "http://192.168.55.103:43000/" };
modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml"; modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml";
modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID"; modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID";
......
...@@ -4146,7 +4146,7 @@ module OneM2M_Templates { ...@@ -4146,7 +4146,7 @@ module OneM2M_Templates {
resourceType := int16,//M resourceType := int16,//M
resourceID := PX_CSE1_RESOURCE_ID,//M resourceID := PX_CSE1_RESOURCE_ID,//M
pointOfAccess := { p_pointOfAccess }, //O pointOfAccess := { p_pointOfAccess }, //O
cSEBase := f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M cSEBase := f_getCompletePoA(PX_TS_CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
cSE_ID := PX_CSE1_ID,//M cSE_ID := PX_CSE1_ID,//M
requestReachability := true//M requestReachability := true//M
}; };
......
...@@ -8878,21 +8878,6 @@ type record CseSimuComponentDesc { ...@@ -8878,21 +8878,6 @@ type record CseSimuComponentDesc {
PortDesc mccPortIn PortDesc mccPortIn
} }
/**
* @desc Test System settings
* @member ae1Simu Ae1Simu component settings
* @member ae2Simu Ae2Simu component settings
* @member cse1Simu Cse1Simu component settings
* @member sutDesc SUT settings
* @member utDesc UpperTester component settings
*/
type record TestSystemSettingsDesc {
AeSimuComponentDesc AE1,
AeSimuComponentDesc AE2,
CseSimuComponentDesc CSE1,
UtDesc UT optional
}
} }
with { with {
encode ""; encode "";
......
...@@ -2260,7 +2260,7 @@ module OneM2M_PermutationFunctions { ...@@ -2260,7 +2260,7 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request; var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE var ResourceType v_resourceType := int16; //remoteCSE
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_SETTINGS.CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
if(not(PICS_MN_CSE)) { if(not(PICS_MN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case"); setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
stop; stop;
...@@ -2494,7 +2494,7 @@ module OneM2M_PermutationFunctions { ...@@ -2494,7 +2494,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var integer v_ae2Index := -1; var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1; var integer v_acpAuxIndex := -1;
var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn) }; var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE2.mcaPortIn) };
// Test control // Test control
...@@ -2607,7 +2607,7 @@ module OneM2M_PermutationFunctions { ...@@ -2607,7 +2607,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var integer v_ae1Index := -1; var integer v_ae1Index := -1;
var integer v_acpAuxIndex := -1; var integer v_acpAuxIndex := -1;
var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn) }; var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE1.mcaPortIn) };
// Test control // Test control
...@@ -5955,7 +5955,7 @@ module OneM2M_PermutationFunctions { ...@@ -5955,7 +5955,7 @@ module OneM2M_PermutationFunctions {
// Preamble // Preamble
if(p_resourceType != int2) { if(p_resourceType != int2) {
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
} }
if(p_resourceType != int1) { if(p_resourceType != int1) {
...@@ -6994,7 +6994,7 @@ module OneM2M_PermutationFunctions { ...@@ -6994,7 +6994,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63)); vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2); v_ae2Index := f_getLatestResource(vc_ae2);
...@@ -8212,11 +8212,11 @@ module OneM2M_PermutationFunctions { ...@@ -8212,11 +8212,11 @@ module OneM2M_PermutationFunctions {
// Preamble // Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1); v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_SETTINGS.AE1.mcaPortIn)}, omit}, omit}}; v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}); v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body // Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
...@@ -8277,7 +8277,7 @@ module OneM2M_PermutationFunctions { ...@@ -8277,7 +8277,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}); v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body // Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
...@@ -10750,7 +10750,7 @@ module OneM2M_PermutationFunctions { ...@@ -10750,7 +10750,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?; v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) { if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex); v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
...@@ -10824,7 +10824,7 @@ module OneM2M_PermutationFunctions { ...@@ -10824,7 +10824,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?; v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) { if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex); v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
...@@ -10901,11 +10901,11 @@ module OneM2M_PermutationFunctions { ...@@ -10901,11 +10901,11 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?; v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
f_checkAeSimuStatus(); f_checkAeSimuStatus();
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}))); // AE2 is registred vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......
...@@ -1107,7 +1107,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -1107,7 +1107,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem { testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM); var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}; v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_ae1.start(f_CSE_REG_CRE_012(v_create)); v_ae1.start(f_CSE_REG_CRE_012(v_create));
v_ae1.done; v_ae1.done;
} }
...@@ -1151,7 +1151,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -1151,7 +1151,7 @@ module OneM2M_Testcases_CSE_Release_1 {
const AttributeAux c_optionalAttribute := {"pointOfAccess", omit}; const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
var CseSimu v_cse1 := CseSimu.create("CSE1") alive; var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute)); v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done; v_cse1.done;
...@@ -1887,11 +1887,11 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -1887,11 +1887,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_createRemoteCSEBase); v_request := valueof(m_createRemoteCSEBase);
v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE
v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse)); v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done; v_cse1.done;
...@@ -2136,7 +2136,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -2136,7 +2136,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM); var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
var template PrimitiveContent v_contentResponse; var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}; v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_contentResponse.aE := mw_contentAeBase; v_contentResponse.aE := mw_contentAeBase;
v_contentResponse.aE.pointOfAccess := ?; v_contentResponse.aE.pointOfAccess := ?;
...@@ -2342,7 +2342,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -2342,7 +2342,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
var template PrimitiveContent v_contentResponse; var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.pointOfAccess := ?; v_contentResponse.remoteCSE.pointOfAccess := ?;
...@@ -2677,7 +2677,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -2677,7 +2677,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive; var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
v_cse1.done; v_cse1.done;
...@@ -2724,7 +2724,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -2724,7 +2724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AttributeList c_optionalAttribute; var AttributeList c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive; var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
c_optionalAttribute := {"pointofAccess"}; c_optionalAttribute := {"pointofAccess"};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute)); v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
...@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem { testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)}; var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive; var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource; var PrimitiveContent v_primitiveContentRetrieveResource;
...@@ -6667,7 +6667,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6667,7 +6667,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem { testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)}; var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateAeBase; var template RequestPrimitive v_updateRequest := m_updateAeBase;
var ResponsePrimitive v_responsePrimitive; var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource; var PrimitiveContent v_primitiveContentRetrieveResource;
......
...@@ -2748,7 +2748,7 @@ module OneM2M_Testcases_CSE_Release_2 { ...@@ -2748,7 +2748,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63)); vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2); v_ae2Index := f_getLatestResource(vc_ae2);
......
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