Merge branch 'STF531-REG-CRE' of https://git.onem2m.org/TST/ATS into STF531-REG-CRE

LibOneM2M/OneM2M_Pixits.ttcn

@@ -59,6 +59,14 @@ module OneM2M_Pixits {
 			 */	
 			modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";	
 			
+			modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
+			
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
+			
+			modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
+			
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
+			
 			modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
 	
 			modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
@@ -69,7 +77,8 @@ module OneM2M_Pixits {
 			
 			modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
 			
-			modulepar ListOfURIs PX_ACOR 					:= {"*"};			
+			modulepar ListOfURIs PX_ACOR 					:= {"*"};
+						
 		}
 		
 		group TesterParameters {

OneM2M_Testcases_CSE.ttcn

@@ -870,13 +870,19 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 	                
+					//Test control
+					if(not(PICS_IN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
+						stop;
+					}
+	                
 					// Test component configuration
 					f_cf01Up();
 	                
 					//Preamble
 
 					//Test Body
-					v_request := valueof(m_createAe(PX_APP_ID, omit, "SAE-ID-STEM"));	
+					v_request := valueof(m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));	
 					
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
@@ -970,7 +976,7 @@ module OneM2M_Testcases_CSE {
 					//Preamble
 					v_remoteCseIndex := f_cse_registrationRemoteCse();
 					vc_ae1 := AeSimu.create("AE1") alive;
-					//vc_ae1.start(f_a);
+					vc_ae1.start(f_cse_preamble_registerAe());
 					
 				
 				}
@@ -997,8 +1003,9 @@ module OneM2M_Testcases_CSE {
 					//Test Body	
 					//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
 	    											
-					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "C"));
+					v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
 			
+					mcaPort.send(m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {