Review of TC_CSE_GMG_UPD_001

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

OneM2M_Testcases_CSE_Release_1.ttcn

@@ -11124,13 +11124,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 				function f_CSE_GMG_UPD_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
-					var integer v_aeIndex, v_aeIndex_2 := -1;
-					var integer v_containerLocalIndex_1 := -1;
-					var integer v_containerLocalIndex_2 := -1;
-					var integer v_acpIndex_1, v_acpIndex_2  := -1;
+					var integer v_aeIndex := -1;
+					var integer v_containerIndex_1, v_containerLocalIndex_2 := -1;
 					var integer v_groupIndex := -1;
+					var XSD.ID v_containerAddress_2;
 					var RequestPrimitive v_request;
-					var template RequestPrimitive v_containerCreateRequest := m_createContainer_noResourceName;
 					var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 					
 					// Test control
@@ -11138,40 +11136,39 @@ module OneM2M_Testcases_CSE_Release_1 {
 						setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
 						stop;
 					}
-                	
+              	
 					// Test component configuration
-					f_cf01Up(true);
-                	
+					f_cf02Up();
+
 					// Test adapter configuration
-                			
+
 					// Preamble
-					v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-					v_acpIndex_1 := f_cse_createResource(int1, m_createAcp("NotInitialized", "NoRetrievePermission", -, int61), -); // AE child resource
-					v_acpIndex_2 := f_cse_createResource(int1, m_createAcp("NotInitialized", "PermissionForEveryone", -, -), -); // AE child resource
-					
-					vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, omit), -1)); // AE2 is registred
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+				
+					vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getCompletePoA()})));
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+				
+					v_aeIndex := f_cse_preamble_registerAe();				
+				
+					//Creating resource in Hosting CSE
+					vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
+					vc_cse1.done;
+				
+					// Test Body
 
-					v_aeIndex_2 := f_getLatestResourceIndex(vc_ae2);
-						
-					v_containerCreateRequest := f_setAcpId(v_containerCreateRequest, {f_getResourceId(vc_resourcesList[v_acpIndex_2].resource)});
+					v_containerAddress_2 := f_getLatestLocalResourceAddress(vc_cse1, e_nonHierarchical, e_spRelative);
 					
-					vc_ae2.start(f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex_2));
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-					
-					v_containerLocalIndex_1 := f_getLatestResource(vc_ae2);
-					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerLocalIndex_1].resource)}, omit, int3, -, - , -), v_aeIndex);
+					v_containerLocalIndex_2 := f_getLatestLocalResourceIndex(vc_cse1);
+
+					v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
-					v_containerCreateRequest := f_setAcpId(v_containerCreateRequest, {f_getResourceId(vc_resourcesList[v_acpIndex_1].resource)});
-					vc_ae2.start(f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex_2));
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 					
-					v_containerLocalIndex_2 := f_getLatestResource(vc_ae2);
+					v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3, -, - , -), v_aeIndex);
 					
-					v_updateRequest.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[v_containerLocalIndex_2].resource)};
+					v_updateRequest.primitiveContent.group_.memberIDs := {v_containerAddress_2};
 					v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);	// creating group
                 	    
 					// Test Body
+                	vc_cse1.start(f_cse_memberTypeValidationHandler(v_containerLocalIndex_2, int4103));
                 	
 					f_send(e_mca_port, m_request(v_request));
 					tc_ac.start;
@@ -11192,7 +11189,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 							setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 						}
 					}
-                					
+				
+					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+							
 					// Postamble
 					f_cse_postamble_deleteResources();