diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index f63e3b408e7457ff5e90619a63fe78bb37857ae6..cdb52369154e24fc3954449621e7b46475c89fbe 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -14223,344 +14223,9 @@ module OneM2M_PermutationFunctions {
group Transaction_Management{
- group Create {
-
- function f_CSE_TMG_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
-
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- const TransactionControl transactionControl := int1; //INITIAL
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
-
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
- if(not match(transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
- setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_cse_isResourcePresent(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- return vc_response.primitive.responsePrimitive;
-
- }//end f_CSE_TMG_CRE_001
-
- function f_CSE_TMG_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_ae2Index := -1;
- var integer v_resourceIndex := -1;
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- v_ae2Index := f_cse_preamble_registerAe(); //other AE
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_request.primitiveContent.transactionMgmt.requestPrimitives.request_list[0].from_ := f_getResourceId(vc_resourcesList[v_ae2Index].resource)//f_getResourceAddress(v_ae2Index);
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
-
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_cse_isResourcePresent(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- return vc_response.primitive.responsePrimitive;
- }//end f_CSE_TMG_CRE_002
-
-
- function f_CSE_TMG_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_ae2Index := -1;
- var integer v_resourceIndex := -1;
- const TransactionControl transactionControl := int2; //LOCK
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
-
- var RequestPrimitive v_createInnerRequestPrimitive := m_create;
- v_createInnerRequestPrimitive.to_ := f_getResourceId(vc_resourcesList[v_aeIndex].resource);
- v_createInnerRequestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex].resource);
-
- v_request.primitiveContent.transaction.requestPrimitive := v_createInnerRequestPrimitive;
-
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
- if(not match(transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
- setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_cse_isResourcePresent(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- return vc_response.primitive.responsePrimitive;
-
-
- }//end f_CSE_TMG_CRE_003
-
- function f_CSE_TMG_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_ae2Index := -1;
- var integer v_resourceIndex := -1;
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- v_ae2Index := f_cse_preamble_registerAe(); //other AE
-
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_request.primitiveContent.transaction.requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_ae2Index].resource);
-// {f_getResourceAddress(v_ae2Index)}
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
-
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted creation of resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_cse_isResourcePresent(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- return vc_response.primitive.responsePrimitive;
- } // end f_CSE_TMG_CRE_004
-
- function f_CSE_TMG_CRE_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
-
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- const TransactionControl c_transactionControl := int1; //INITIAL
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
-
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
- if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
- setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_cse_isResourcePresent(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- return vc_response.primitive.responsePrimitive;
-
- }//end f_CSE_TMG_CRE_005 //TODO
-
- } // end group Create
-
group Update{
- function f_CSE_TMG_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
+ function f_CSE_TMG_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -14579,10 +14244,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_ae2Index := f_cse_preamble_registerAe();//c_CRUDNDi);
- //f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
-
+
if(p_resourceType != int18) {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
}
@@ -14591,14 +14253,13 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- v_request.from_ := f_getResourceId(vc_resourcesList[v_ae2Index].resource);
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4123))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Originator has no privilege. Creator is not same as originator of request " & int2str(enum2int(p_resourceType)) );
+ setverdict(pass, __SCOPE__ & ": ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED." & int2str(enum2int(p_resourceType)) );
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
@@ -14606,7 +14267,7 @@ module OneM2M_PermutationFunctions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Updating transactionControl when originator is not creator");
+ setverdict(fail, __SCOPE__ & ": Updating Invalid transactionControl ");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
@@ -14621,10 +14282,9 @@ module OneM2M_PermutationFunctions {
// Tear down
f_cf01Down();
- }//end f_CSE_TMG_UPD_001
-
+ }//end f_CSE_TMG_UPD_003
- function f_CSE_TMG_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
+ function f_CSE_TMG_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -14648,7 +14308,6 @@ module OneM2M_PermutationFunctions {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
}
- p_createRequestPrimitive.primitiveContent.transactionMgmt.transactionMode := int1;
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_parentIndex);
// Test Body
@@ -14657,17 +14316,17 @@ module OneM2M_PermutationFunctions {
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": BAD_REQUEST. transactionMode is CSE_CONTROLLED " & int2str(enum2int(p_resourceType)) );
+ setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Updating transactionControl when transactionMode is CSE_CONTROLLED");
+ setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
@@ -14682,9 +14341,10 @@ module OneM2M_PermutationFunctions {
// Tear down
f_cf01Down();
- }//end f_CSE_TMG_UPD_002
+ }//end f_CSE_TMG_UPD_004
- function f_CSE_TMG_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
+
+ function f_CSE_TMG_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -14741,9 +14401,9 @@ module OneM2M_PermutationFunctions {
// Tear down
f_cf01Down();
- }//end f_CSE_TMG_UPD_003
+ }//end f_CSE_TMG_UPD_006
- function f_CSE_TMG_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
+ function f_CSE_TMG_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -14800,132 +14460,91 @@ module OneM2M_PermutationFunctions {
// Tear down
f_cf01Down();
- }//end f_CSE_TMG_UPD_004
-
- function f_CSE_TMG_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
-
+ }//end f_CSE_TMG_UPD_007
+ } // end of update
+
+
+ group Delete{
+ function f_CSE_TMG_DEL_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
+ var integer v_parentIndex := -1;
+ var integer v_containerIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_parentIndex := -1;
-
+
// Test control
-
+
// Test component configuration
f_cf01Up(true);
-
+
// Test adapter configuration
-
+
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_ae2Index := f_cse_preamble_registerAe();//c_CRUDNDi);
- //f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi)
- if(p_resourceType != int18) {
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
+
+ if(p_resourceType == int4) {
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+ v_parentIndex := v_containerIndex;
+ } else if(p_resourceType != int18) {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
}
-
+
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_parentIndex);
-
+
// Test Body
- v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- v_request.from_ := f_getResourceAddress(v_ae2Index);
-
- f_send(e_mcaPort, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Originator has no privilege. Creator is not same as originator of request " & int2str(enum2int(p_resourceType)) );
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Updating transactionControl when originator is not creator");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+ if(p_resourceType == int23) {
+ if (vc_ae2.running) {
+ vc_ae2.stop;
}
+ vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler());
}
-
- vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_TMG_UPD_005
-
- function f_CSE_TMG_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
-
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var integer v_ae2Index := -1;
- var integer v_parentIndex := -1;
-
- // Test control
-
- // Test component configuration
- f_cf01Up(true);
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- if(p_resourceType != int18) {
- v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
- }
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_parentIndex);
-
- // Test Body
- v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
+ v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4123))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED." & int2str(enum2int(p_resourceType)) );
+ setverdict(pass, __SCOPE__ & ": Resource" & int2str(enum2int(p_resourceType)) & " deleted successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Updating Invalid transactionControl ");
+ setverdict(fail, __SCOPE__ & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
+ setverdict(fail, __SCOPE__ & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
}
}
+
+ f_checkAeSimuStatus();
- vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
-
+ //Check to see if the resource is present or not
+ if (f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(vc_resourcesList[v_resourceIndex].resource))){
+ setverdict(pass, __SCOPE__ & ":INFO: Resource deleted");
+ } else {
+ setverdict(fail, __SCOPE__ & ":ERROR: Resource not deleted");
+ }
+
// Postamble
f_cse_postamble_deleteResources();
-
+
// Tear down
f_cf01Down();
-
- }//end f_CSE_TMG_UPD_003
- } // end of update
-
+
+ };//end f_CSE_DMR_DEL_001
+
+ } // end of delete
}// end group Transaction_Management
}//end group CSE