Uninitialized values checking

LibOneM2M/OneM2M_Functions.ttcn

@@ -2374,15 +2374,15 @@ module OneM2M_Functions {
* @return 	Internal resource index of AE or -1 in case of failure
* @verdict	inconc if no AE registration request is received
*/
-			function f_ae_preamble_registerAe(template UtTriggerPrimitive p_utRequest := m_create) runs on CseSimu return integer {
+			function f_ae_preamble_registerAe(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
var MsgIn v_request;
var integer v_localResourceIndex, v_parentIndex;
var charstring v_action := "Please, register the AE on the Tester";
-				p_utRequest.to_ := f_getLocalResourceAddress(-,-,-);
-				if(not(ispresent(p_utRequest.primitiveContent))) {
-					p_utRequest.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
+				p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-,-,-);
+				if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
+					p_utRequest.requestPrimitive.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
}
f_sendUtPrimitive(p_utRequest, v_action);
@@ -2416,7 +2416,7 @@ module OneM2M_Functions {
* @return 	Internal resource index of Container or -1 in case of failure
* @verdict	inconc if no Container create request is received
*/
-			function f_ae_preamble_createContainer(template UtTriggerPrimitive p_utRequest := m_create) runs on CseSimu return integer {
+			function f_ae_preamble_createContainer(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
@@ -2424,8 +2424,8 @@ module OneM2M_Functions {
var RequestPrimitive v_rp;
var charstring v_action := "Please, create a Container resource on the Tester";
-				if(not(ispresent(p_utRequest.primitiveContent))) {
-					p_utRequest.primitiveContent.container := m_contentCreateContainer;
+				if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
+					p_utRequest.requestPrimitive.primitiveContent.container := m_contentCreateContainer;
}
f_sendUtPrimitive(p_utRequest, v_action);
@@ -3549,8 +3549,7 @@ module OneM2M_Functions {
if (PX_UT_IMPLEMENTED){
-				p_utRequest.from_ := "UNINITIALIZED";
-				p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+				p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
deactivate;
utPort.send(valueof(p_utRequest));