Commit 93b62796 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Small corrections to REG test cases where From is set to "S"


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent be4de28e
...@@ -2585,7 +2585,8 @@ module OneM2M_Functions { ...@@ -2585,7 +2585,8 @@ module OneM2M_Functions {
v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT; v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_PROTOCOL_BINDING_CSE1, PX_CSE1_ADDRESS, "")}; v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_PROTOCOL_BINDING_CSE1, PX_CSE1_ADDRESS, "")};
v_myResource.cSEBase.cseType := vc_cseType; v_myResource.cSEBase.cseType := vc_cseType;
v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
}else if(p_resourceType == int16 and ispresent(p_resource)) { //RemoteCSE }else if(p_resourceType == int16 and ispresent(p_resource)) { //RemoteCSE
if(ischosen(p_resource.remoteCSE)){ if(ischosen(p_resource.remoteCSE)){
v_myResource.remoteCSE := valueof(p_resource.remoteCSE); v_myResource.remoteCSE := valueof(p_resource.remoteCSE);
......
...@@ -797,7 +797,7 @@ module OneM2M_Templates { ...@@ -797,7 +797,7 @@ module OneM2M_Templates {
* @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S * @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S
*/ */
template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := { template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)} primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_link)}
}; };
/** /**
......
...@@ -690,11 +690,12 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -690,11 +690,12 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_request; var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive; var template RequestPrimitive v_requestPrimitive;
template XSD.AnyURI v_link := pattern "/?*";
//Test control //Test control
// Test component configuration // Test component configuration
f_cf02UpCseSimuMaster(); f_cf02UpCseSimuMaster(int1);
//Preamble //Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE); vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
...@@ -702,7 +703,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -702,7 +703,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body //Test Body
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S"))); vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -); v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, PX_CSE_ID & v_link);
v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID; v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
tc_ac.start; tc_ac.start;
......
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