Centralized MyAe2 name in c_defaultAE2Name

One second gap between contentInstances creation in TC_CSE_DMR_DEL_007 and TC_CSE_DMR_DEL_009

Signed-off-by: acverdugo <acverdugo@at4wireless.com>

LibOneM2M/OneM2M_Functions.ttcn

@@ -667,7 +667,7 @@ module OneM2M_Functions {
 			function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu {
 				if(p_resourceType == int23){
 					
-					vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
+					vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
 					
 					f_checkComponentDoneAndGetVerdict(vc_ae2);
 					

LibOneM2M/OneM2M_TypesAndValues.ttcn

@@ -38,6 +38,7 @@ module OneM2M_TypesAndValues {
 	const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
 	const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
 	const XSD.ID c_aeAuxName := "MyAe";
+	const XSD.String c_defaultAE2Name := "MyAe2";
 	const XSD.String c_acpAuxName := "MyAcp";
 	const charstring c_invalid_location_update_period	:= "-PT30M10S" ;//duration set to invalid value  (minus value)
 	const XSD.ID c_resourceShortNameLatest := "la";		//<latest>

OneM2M_Testcases_CSE.ttcn

@@ -4376,7 +4376,7 @@ module OneM2M_Testcases_CSE {
     					
 						if(ispresent(p_parentRequestPrimitive)) {
 							if(match(int23, p_parentRequestPrimitive.resourceType)){
-								vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+								vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
 								vc_ae2.done;
 								v_ae2Index := f_getResource(vc_ae2);
 								p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)}; 
@@ -4411,7 +4411,7 @@ module OneM2M_Testcases_CSE {
 						// Test Body
     					
 						if(match(int23, p_requestPrimitive.resourceType)){
-							vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+							vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
 							vc_ae2.done;
 							v_ae2Index := f_getResource(vc_ae2);
 							p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)}; 
@@ -16012,6 +16012,7 @@ module OneM2M_Testcases_CSE {
 						var integer v_contentInstanceIndex_1 := -1;
 						var integer v_contentInstanceIndex_2 := -1; 
 						const ResourceType c_containerResourceType := int3;
+						timer t_contentInstanceCreationGap;
 								   
 						// Test control
             
@@ -16026,6 +16027,10 @@ module OneM2M_Testcases_CSE {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
 						
 						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
+						
+						t_contentInstanceCreationGap.start(1.0);
+						t_contentInstanceCreationGap.timeout;
+						
 						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
 							
 						// Test Body
@@ -16152,6 +16157,7 @@ module OneM2M_Testcases_CSE {
 						var integer v_contentInstanceIndex_1 := -1;
 						var integer v_contentInstanceIndex_2 := -1; 
 						const ResourceType c_containerResourceType := int3;
+						timer t_contentInstanceCreationGap;
 								   
 						// Test control
             
@@ -16166,6 +16172,10 @@ module OneM2M_Testcases_CSE {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 
 						
 						v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); 
+						
+						t_contentInstanceCreationGap.start(1.0);
+						t_contentInstanceCreationGap.timeout;
+												
 						v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
 							
 						// Test Body
@@ -19167,7 +19177,7 @@ module OneM2M_Testcases_CSE {
 	
 						// Preamble
 						v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
-						v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
+						v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, omit), -1); // AE2 is registred
 						v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
 						v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_1); // AE1 child resource
 						v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_2); // AE2 child resource