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

Code improvements for compliance to TTCN-3:2019


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 504e91d1
......@@ -14,6 +14,7 @@ module OneM2M_Functions {
import from XSD all;
import from OneM2M_Templates all;
import from OneM2M_Types all;
import from OneM2M_Ports all;
import from OneM2M_TypesAndValues all;
import from OneM2M_TestSystem all;
import from OneM2M_Pixits all;
......@@ -61,8 +62,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
......@@ -119,8 +120,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
//Initialze the IUT
......@@ -156,7 +157,7 @@ module OneM2M_Functions {
v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_UT);
......@@ -214,8 +215,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
......@@ -271,8 +272,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
......@@ -325,8 +326,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
//Initialze the IUT
......@@ -367,7 +368,7 @@ module OneM2M_Functions {
v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_UT);
......@@ -426,8 +427,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
......@@ -1922,7 +1923,7 @@ module OneM2M_Functions {
* @param p_responsePrimitive Expected responsePrimitive in the notification
* @verdict
*/
function f_cse_notifyProcedure_responsePrimitiveHandler(template ResponsePrimitive p_responsePrimitive) runs on AeSimu {
function f_cse_notifyProcedure_responsePrimitiveHandler(template ResponsePrimitive p_responsePrimitive) runs on AeSimu {
// Local variables
var ResponsePrimitive v_responsePrimitive;
......@@ -2022,7 +2023,7 @@ module OneM2M_Functions {
* @param p_notification Expected notification
* @verdict
*/
function f_cse_notifyProcedure_subscriptionDeletionHandler( template Notification p_notification) runs on AeSimu {
function f_cse_notifyProcedure_subscriptionDeletionHandler( template Notification p_notification) runs on AeSimu {
var ResponsePrimitive v_responsePrimitive;
//Activate defaults when running on a PTC
......@@ -2124,7 +2125,7 @@ module OneM2M_Functions {
* @param p_expectedResourceIndex Expected target parent resource of the announcemnet
* @verdict
*/
function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu return integer{
function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu return integer{
// Local variables
var MsgIn v_request;
var integer v_parentIndex := vc_localRemoteCseIndex;
......@@ -2238,7 +2239,7 @@ module OneM2M_Functions {
* @verdict
*/
//TODO TO BE FINALIZED
function f_cse_announcementProcedure_updateHandler(template RequestPrimitive p_requestprimitive := mw_update, in ResponseStatusCode p_responseStatusCode := int2004, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
function f_cse_announcementProcedure_updateHandler(template RequestPrimitive p_requestprimitive := mw_update, in ResponseStatusCode p_responseStatusCode := int2004, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
// Local variables
var MsgIn v_request;
......@@ -2280,7 +2281,7 @@ module OneM2M_Functions {
* @verdict
*/
//TODO To finalize this function
function f_cse_announcementProcedure_deleteHandler(template RequestPrimitive p_requestprimitive := mw_delete, in ResponseStatusCode p_responseStatusCode := int2002, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
function f_cse_announcementProcedure_deleteHandler(template RequestPrimitive p_requestprimitive := mw_delete, in ResponseStatusCode p_responseStatusCode := int2002, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
// Local variables
var MsgIn v_request;
var integer v_parentIndex := vc_localRemoteCseIndex;
......@@ -2696,7 +2697,7 @@ module OneM2M_Functions {
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
function f_cse_registrationRemoteCse(in template (present) RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
var MsgIn v_request;
var ResponsePrimitive v_response;
......@@ -2750,7 +2751,7 @@ module OneM2M_Functions {
* @desc Receive a request from the CSE IUT to the Test System (simulating a CSE)
* @param p_requestPrimitive Expected CREATE request primitive
*/
function f_cse_receiveCreateRequest_cseSimu(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu {
function f_cse_receiveCreateRequest_cseSimu(in template (present) RequestPrimitive p_requestPrimitive := ?) runs on CseSimu {
var ResponsePrimitive v_responsePrimitive;
//Activate defaults when running on a PTC
......@@ -5670,9 +5671,9 @@ module OneM2M_Functions {
function f_send(
in InterfaceIds p_interfaceIds,
in MsgOut p_msgOut
in template MsgOut p_msgOut
) runs on Tester {
log(">>> f_send: ", p_interfaceIds);
log(">>> f_send: ", p_interfaceIds);
p_msgOut.host := vc_myInterfaces[enum2int(p_interfaceIds)].myHost;
p_msgOut.protocolBinding := vc_myInterfaces[enum2int(p_interfaceIds)].myProtocolBinding;
......
This diff is collapsed.
......@@ -8395,8 +8395,8 @@ group InvalidTypes {
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.subscription_list) "untagged";
variant (choice.subscription_list[-]) "name as 'subscription'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Container_update_invalid {
......
This diff is collapsed.
......@@ -455,7 +455,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_REG_CRE_001() runs on CseSimu {
function f_AE_REG_CRE_001() runs on CseSimu system AeSystem {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
......@@ -661,7 +661,7 @@ module OneM2M_Testcases_AE_Release_1 {
}
function f_AE_REG_DEL_001() runs on CseSimu {
function f_AE_REG_DEL_001() runs on CseSimu system AeSystem {
//variables
var MsgIn v_request;
......@@ -726,7 +726,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_CRE_001() runs on CseSimu {
function f_AE_DMR_CRE_001() runs on CseSimu system AeSystem {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
......@@ -778,7 +778,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_CRE_002() runs on CseSimu {
function f_AE_DMR_CRE_002() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var MsgIn v_request;
......@@ -1279,7 +1279,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_RET_002() runs on CseSimu {
function f_AE_DMR_RET_002() runs on CseSimu system AeSystem {
var integer v_resourceIndex, v_containerResourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1338,7 +1338,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_RET_003() runs on CseSimu {
function f_AE_DMR_RET_003() runs on CseSimu system AeSystem {
var integer v_resourceIndex, v_containerResourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1398,7 +1398,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_RET_004() runs on CseSimu {
function f_AE_DMR_RET_004() runs on CseSimu system AeSystem {
var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1454,7 +1454,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_RET_005() runs on CseSimu {
function f_AE_DMR_RET_005() runs on CseSimu system AeSystem {
var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1516,7 +1516,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_DEL_001() runs on CseSimu {
function f_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1577,7 +1577,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_DEL_002() runs on CseSimu {
function f_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1638,7 +1638,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_DEL_003() runs on CseSimu {
function f_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1699,7 +1699,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_DMR_DEL_004() runs on CseSimu {
function f_AE_DMR_DEL_004() runs on CseSimu system AeSystem {
var integer v_resourceIndex, v_containerResourceIndex := -1;
var PrimitiveContent v_localResource;
......@@ -1771,7 +1771,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_SUB_CRE_001() runs on CseSimu {
function f_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
......@@ -1958,7 +1958,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_SUB_NTF_001() runs on CseSimu {
function f_AE_SUB_NTF_001() runs on CseSimu system AeSystem {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
......@@ -2067,7 +2067,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_SUB_NTF_002() runs on CseSimu {
function f_AE_SUB_NTF_002() runs on CseSimu system AeSystem {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
......@@ -2180,7 +2180,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_cse1.done;
}
function f_AE_PCH_001() runs on CseSimu {
function f_AE_PCH_001() runs on CseSimu system AeSystem {
//Local variables
var integer v_pollingChannelIndex := -1;
var integer v_aeIndex := -1;
......
This diff is collapsed.
......@@ -2464,7 +2464,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container := mw_contentContainer_allOmit;
v_contentResponse.container.lastModifiedTime := ?;
v_contentResponse.container.stateTag := ?;
v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
......@@ -2478,7 +2478,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_ := mw_contentGroup_allOmit;
v_contentResponse.group_.lastModifiedTime := ?;
v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
......@@ -2492,7 +2492,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
......@@ -2744,7 +2744,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
function f_CSE_DMR_NTF_002() runs on AeSimu {
function f_CSE_DMR_NTF_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
......@@ -2893,7 +2893,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_NTF_001() runs on AeSimu {
function f_CSE_SUB_NTF_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -2968,7 +2968,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_NTF_002() runs on AeSimu {
function f_CSE_SUB_NTF_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3043,7 +3043,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_NTF_003() runs on AeSimu {
function f_CSE_SUB_NTF_003() runs on AeSimu system CseSystem {
// Local variables
timer t_batchNotificationTimer := PX_TAC * 2.0;
var float v_elapsedTime;
......@@ -3127,7 +3127,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_002() runs on AeSimu {
function f_CSE_SUB_UPD_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3214,7 +3214,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_003() runs on AeSimu {
function f_CSE_SUB_UPD_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3297,7 +3297,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_004() runs on AeSimu {
function f_CSE_SUB_UPD_004() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3391,7 +3391,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_005() runs on AeSimu {
function f_CSE_SUB_UPD_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3477,7 +3477,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_006() runs on AeSimu {
function f_CSE_SUB_UPD_006() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
......@@ -3560,7 +3560,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_007() runs on AeSimu {
function f_CSE_SUB_UPD_007() runs on AeSimu system CseSystem {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
......@@ -3632,7 +3632,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_008() runs on AeSimu {
function f_CSE_SUB_UPD_008() runs on AeSimu system CseSystem {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
......@@ -3708,7 +3708,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_UPD_009() runs on AeSimu {
function f_CSE_SUB_UPD_009() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
......@@ -3799,7 +3799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_DEL_002() runs on AeSimu {
function f_CSE_SUB_DEL_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -3882,7 +3882,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_SUB_DEL_003() runs on AeSimu {
function f_CSE_SUB_DEL_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
......@@ -4016,7 +4016,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_PCH_001() runs on AeSimu {
function f_CSE_PCH_001() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
......@@ -4126,7 +4126,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_PCH_002() runs on AeSimu {
function f_CSE_PCH_002() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
......@@ -4231,7 +4231,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_PCH_003() runs on AeSimu {
function f_CSE_PCH_003() runs on AeSimu system CseSystem {
//Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
......@@ -4339,7 +4339,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_cse1.done;
}
function f_CSE_PCH_004() runs on CseSimu {
function f_CSE_PCH_004() runs on CseSimu system CseSystem {
//Local variables
var integer v_localResourceIndex := -1;
var MsgIn v_request_req1, v_request_req3;
......@@ -4462,7 +4462,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
function f_CSE_PCH_006() runs on AeSimu {
function f_CSE_PCH_006() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
......@@ -4966,11 +4966,11 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_FLXC_CRE_001() runs on AeSimu {
function f_CSE_FLXC_CRE_001() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request := m_create;
var RequestPrimitive v_request := valueof(m_create);
// Test control
// Test component configuration
......@@ -4981,7 +4981,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -);//AE1 is registred;
v_request.primitiveContent := { genericInterworkingService_invalid := m_contentCreateGenericInterworkingService_invalid };
v_request.primitiveContent := { genericInterworkingService_invalid := valueof(m_contentCreateGenericInterworkingService_invalid) };
v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
f_send(e_mca_port, m_request(v_request));
......@@ -5031,7 +5031,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_FLXC_CRE_002() runs on AeSimu {
function f_CSE_FLXC_CRE_002() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
......@@ -5046,7 +5046,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -);//AE1 is registred;
v_request := m_createGenericInterworkingServiceBase;
v_request := valueof(m_createGenericInterworkingServiceBase);
v_request.primitiveContent.genericInterworkingService.containerDefinition := "urn:m2m:nonExistingSchemaDefinition.xsd";
v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
......@@ -5101,11 +5101,11 @@ module OneM2M_Testcases_CSE_Release_2 {
}
function f_CSE_FLXC_UPD_001() runs on AeSimu {
function f_CSE_FLXC_UPD_001() runs on AeSimu system CseSystem {
//Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request := m_create;
var RequestPrimitive v_request := valueof(m_create);
var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase);
v_updateRequest.primitiveContent.genericInterworkingService.inputDataPointLinks := {
dataLinkEntry_list := {
......@@ -5181,11 +5181,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
function f_CSE_FLXC_UPD_002() runs on AeSimu {
function f_CSE_FLXC_UPD_002() runs on AeSimu system CseSystem {
//Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request := m_create;
var RequestPrimitive v_request := valueof(m_create);
var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase);
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.genericInterworkingService.labels := v_labels_1;
......@@ -5254,11 +5254,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
function f_CSE_FLXC_UPD_003() runs on AeSimu {
function f_CSE_FLXC_UPD_003() runs on AeSimu system CseSystem {
//Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request := m_create;
var RequestPrimitive v_request := valueof(m_create);
var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase_invalid);
v_updateRequest.primitiveContent.genericInterworkingService_invalid.expirationCounter := 1;
......
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