TTCN corrections for TC_CSE_REG_CRE_005

LibOneM2M/OneM2M_Templates.ttcn

@@ -591,7 +591,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc CREATE request primitive for remoteCSE resource
 			 */
-			template RequestPrimitive mw_createRemoteCSEBase() modifies mw_create := {
+			template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int16,
 				primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
 			};

OneM2M_Testcases.ttcn

@@ -1001,33 +1001,48 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT accepts an AE registration (allowed App-ID, S-AE-ID-STEM not provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_005() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_005() runs on InCseSimu system CseSystem {
 		  	  	
 					var RequestPrimitive v_request;
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 	                
 					// Test component configuration
-					f_cf02Up();
+					f_cf02UpCseSimuMaster();
 		  	  	
 					//Preambule
-					v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
+					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
 		
 					//Test Body
-					v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
+					vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));				
 	    									
-					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
+					//v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 		  	  		
-					mcaPort.send(m_request(v_request));
+					//mcaPort.send(m_request(v_request));
+					tc_ac.start;
+					alt{
+						[]mccPort.receive(mw_request(mw_createAEAnnc("/S", "CSE_ID", -))){
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
+						}
+						[] mccPort.receive {
+							tc_ac.stop;
+							setverdict(fail, __SCOPE__ & ": Error while creating AE");
+						}
+						[] tc_ac.timeout {
+							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
+						}
+					}
 					
-					vc_cseSimu.start(f_cse_receiveCreateRequest(mw_createAEAnnc(-, -, -)));
-					vc_cseSimu.done;
+					/*vc_cseSimu.start(f_cse_receiveCreateRequest(mw_createAEAnnc(-, -, -)));
+					vc_cseSimu.done;*/
 													
 					// Postamble
-					f_cse_postamble_deleteResources();
+					f_cse_postamble_deleteResourcesCSE();
 					
 					// Tear down
-					f_cf01Down();
+					f_cf02DownCseSimuMaster();
 						
 				}