Review and clean up of TC_CSE_REG_CRE_009

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

OneM2M_Testcases_CSE_Release_1.ttcn

@@ -1001,11 +1001,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
 									
 					//Create AEAnnc				
-					v_aeAnncIndex := f_cse_announcementProcedure_announceResource(int2, m_createAEAnnc(-, PX_CSE1_ID & "/" & "S", PX_APP_ID, PX_CSE1_ID & "/" & "S"));
+					v_aeAnncIndex := f_cse_announcementProcedure_announceResource(int2, m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_CSE1_ID & "/" & "S", PX_APP_ID, PX_CSE1_ID & "/" & "S"));
 					
 					//Update AEAnnc to simulate deregistration of AE
 					v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, valueof(m_updateAEAnncBase));//TODO 
-					//v_request.primitiveContent.aEAnnc.link := "";//TODO To fix when base specs are fixed
+					v_request.primitiveContent.aEAnnc.link := "INACTIVE";
 					
 					f_cse_updateAnnouncedResource(v_request);
 					
@@ -1014,6 +1014,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO 
 					v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
+					v_request.primitiveContent.aEAnnc.link := PX_CSE1_ID & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
 		  	  		
 					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
@@ -1021,12 +1022,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": AE creation redirected.");
-							//continue to test the content
+							setverdict(pass, __SCOPE__ & ": AEAnnc updated correctly");
 						}
-						[] mccPort.receive {
+						[] mccPort.receive(mw_response(mw_responsePrimitive(?))) -> value v_response {
 							tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error while creating AE");
+							setverdict(fail, __SCOPE__ & ": Error while updating AEAnnc resource");
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while creating AE");