TC_CSE_REG_CRE_009 - A few things fixed but NOT finalized

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Templates.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 340 2017-08-07 12:08:41Z reinaortega $
+ *              $Id: OneM2M_Templates.ttcn 344 2017-08-07 14:11:47Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -416,8 +416,14 @@ module OneM2M_Templates {
         	
         	template (value) RequestPrimitive m_updateAE modifies m_update := {
 				requestIdentifier := "m_updateAE" & f_rnd(1, 1000000),
-				primitiveContent := {aE := m_contentUpdateAE}
+				primitiveContent := {aE := m_contentUpdateAe}
         	}
+        	
+        	template (value) RequestPrimitive m_updateAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_update:= {
+				requestIdentifier := testcasename() & "-m_updateAEAnnc" & f_rnd(1, 1000000),
+				resourceType := int10002,
+				primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
+			};
     	}//end group Update
     	
     	group Create {
@@ -2265,7 +2271,7 @@ module OneM2M_Templates {
 			choice := omit
     	}
     	
-    	template (value) AE_optional m_contentUpdateAE := {
+    	template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
 			resourceName := omit,
 			resourceType := omit,
 			resourceID := omit,
@@ -2275,9 +2281,8 @@ module OneM2M_Templates {
 			labels := omit,
 			accessControlPolicyIDs := omit,
 			expirationTime := omit,
+			link := omit,
 			dynamicAuthorizationConsultationIDs := omit,
-			announceTo := omit,
-			announcedAttribute := omit,
 			appName := omit,
 			app_ID := omit,
 			aE_ID := omit,
@@ -2289,7 +2294,7 @@ module OneM2M_Templates {
 			e2eSecInfo := omit,
 			choice := omit
     	}
-		
+ 		
 	}//end group ContentUpdate
 
 	group ResponseContent {

OneM2M_Testcases.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 343 2017-08-07 13:34:49Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 344 2017-08-07 14:11:47Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -1028,20 +1028,20 @@ module OneM2M_Testcases {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
-					var integer v_cseBaseIndex := -1;
+					var integer v_aeAnncIndex := -1;
 					var ResourceType v_resourceType := int2;
 	                
 	                // Test component configuration
 					f_cf02Up();
 		  	  	
 					//Preambule
-					v_cseBaseIndex := f_cse_preamble_registerAe();
-					f_cse_postamble_deleteResources(); //to deregister the AE, I don't know if it's correct like this?
+					v_aeAnncIndex := f_cse_preamble_registerAe();//TODO TestSystem acting as MN. It should register AeAnnc into the IUT (IN) via mcc
+					f_cse_deleteResource(valueof(m_deleteRequest(f_getResourceAddress(v_aeAnncIndex)))); //to deregister the AE
 		
 					//Test Body
-					v_request := valueof(m_createAEAnnc(-, "CSE_ID", "/S", "APP_ID", "S-AE-ID-STEM"));	//TODO to double check all parameters			
+					v_request := valueof(m_updateAEAnnc(-, -, -, "APP-ID", -));	//TODO to double check all parameters			
 	    									
-					v_request := f_getUpdateRequestPrimitive(v_resourceType,v_cseBaseIndex, v_request);
+					v_request := f_getUpdateRequestPrimitive(v_resourceType,v_aeAnncIndex, v_request);//TODO 
 		  	  		
 					mccPort.send(m_request(v_request));
 					tc_ac.start;
@@ -5879,10 +5879,12 @@ module OneM2M_Testcases {
 						// Preamble
 						v_acpAuxIndex := f_cse_preamble_createAcpAux(-, -);//c_CRUDNDi)
 						
-						v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});//c_CRUDNDi;
+						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
 						
 						f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
 										
+						p_requestPrimitive := f_setAcpId( p_requestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
+						
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
 
 						f_cse_updateAcpAuxResource(int61); //c_CUDNDi