From de27d7592f987ff83b4a53a71fa965043292ac09 Mon Sep 17 00:00:00 2001
From: Naum Spaseski <naum.spaseski@gmail.com>
Date: Wed, 23 Aug 2017 09:03:07 +0200
Subject: [PATCH] Deleted unused variable & corrected groupIds for elements
under CSEBase
Signed-off-by: Naum Spaseski <naum.spaseski@gmail.com>
---
LibOneM2M/OneM2M_Functions.ttcn | 24 +++++++++++++-----------
LibOneM2M/OneM2M_TestSystem.ttcn | 2 +-
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b17356f..95b9e7a 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -208,14 +208,13 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass,__SCOPE__&":INFO: Application registered successfuly");
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)) {
- vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
- if(ispresent(vc_aeAux.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
+ if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
+ f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
@@ -238,7 +237,7 @@ module OneM2M_Functions {
}
f_checkCseTesterStatus();
- return v_aeAuxIndex;
+ return vc_aeAuxIndex;
}
@@ -278,12 +277,11 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&": INFO: Application registered successfuly");
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)) {
- vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE;
- v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
- if(ispresent(vc_aeAux.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
+ if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
+ f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
@@ -307,7 +305,7 @@ module OneM2M_Functions {
}
f_checkCseTesterStatus();
- return v_aeAuxIndex;
+ return vc_aeAuxIndex;
}
@@ -1453,7 +1451,11 @@ module OneM2M_Functions {
if (p_resourceType == int9) {//group
if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
- p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
+ if (p_parentIndex == -1){
+ p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[vc_aeAuxIndex].resource)};
+ }else{
+ p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
+ }
}
}
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 6c2d7d5..b9af2a7 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -40,7 +40,7 @@ module OneM2M_TestSystem {
port OneM2MPort mccPort;
//global variables
- var AE_optional vc_aeAux;//TODO To be removed
+ var integer vc_aeAuxIndex;//TODO To be removed
var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
var AccessControlPolicy_optional vc_acpAux;
var integer vc_acpAuxIndex := -1;
--
GitLab