Commit c170c6e4 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/Release1'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 299d9baf 267ceff9
......@@ -2701,8 +2701,29 @@ module OneM2M_Functions {
v_myResource.contentInstance.expirationTime := "20301231T012345";
}
v_myResource.contentInstance.stateTag := 0;
v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
if(not(ispresent(p_resource.contentInstance.content))) {
v_myResource.contentInstance.contentSize := 0;
v_myResource.contentInstance.content := omit;
} else {
v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
}
}
} else if(p_resourceType == int23 and ispresent(p_resource)) {//Subscription
if(ischosen(p_resource.subscription)){
v_myResource.subscription := valueof(p_resource.subscription);
v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
if(not(ispresent(p_resource.subscription.resourceName))) {
v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
}
v_myResource.subscription.resourceType := p_resourceType;
v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.subscription.creationTime := fx_generateTimestamp();
v_myResource.subscription.lastModifiedTime := v_myResource.subscription.creationTime;
if(not(ispresent(p_resource.subscription.expirationTime))) {
v_myResource.subscription.expirationTime := "20301231T012345";
}
}
} else if(p_resourceType == int23 and ispresent(p_resource)) { //Subscription
......
This diff is collapsed.
......@@ -1679,7 +1679,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
......@@ -3036,7 +3036,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if (PX_MN_CSE) {
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
}else if (PX_IN_CSE) {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
}
......@@ -7300,7 +7300,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
//Register the CSE
f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Preamble
vc_ae1.start(f_cse_preamble_registerAe());
......@@ -7399,7 +7399,7 @@ module OneM2M_PermutationFunctions {
//Preamble
v_aeIndex := f_cse_preamble_registerAe();
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnncBase(-, -)));
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(-, -)));
v_resourceIndex := f_cse_createResource(int3,v_createContainer, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
......@@ -7501,7 +7501,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Register the CSE
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
f_checkCseSimuStatus();
......@@ -7520,7 +7520,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
[] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
......@@ -7633,7 +7633,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Register the CSE
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
f_checkCseSimuStatus();
......@@ -7652,7 +7652,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
[] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
......
......@@ -1844,7 +1844,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
tc_ac.start;
alt {
[not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
[not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSE)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
......@@ -2742,7 +2742,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Send Trigger Message
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
......
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