Updates on TC_CSE_DMR_RET_013_AE, TC_CSE_DMR_RET_015_AE,...

Updates on TC_CSE_DMR_RET_013_AE, TC_CSE_DMR_RET_015_AE, TC_CSE_DMR_RET_016_AE, TC_CSE_DMR_RET_017_AE, TC_CSE_DMR_RET_018_AE_LBL, TC_CSE_DMR_RET_019_AE_LBL_AT

OneM2M_Testcases_CSE.ttcn

@@ -7789,7 +7789,12 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						
+						if(p_resourceType != int2) {	//ResourceType != AE
+						
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+							
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8096,7 +8101,9 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);	
+						if(p_resourceType != int2) {	//ResourceType != AE
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);	
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8265,7 +8272,9 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						if(p_resourceType != int2) {	//ResourceType != AE
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8275,9 +8284,9 @@ module OneM2M_Testcases_CSE {
 						}
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
 	
-						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-						
-						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+							f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+							
+							v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
     									
 						}else{
 							vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8518,7 +8527,9 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						if(p_resourceType != int2) {	//ResourceType != AE
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8528,9 +8539,9 @@ module OneM2M_Testcases_CSE {
 						}
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
 	
-						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-						
-						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+							f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+							
+							v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
     									
 						}else{
 							vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8659,7 +8670,9 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						if(p_resourceType != int2) {	//ResourceType != AE
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8669,9 +8682,9 @@ module OneM2M_Testcases_CSE {
 						}
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
 	
-						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-						
-						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+							f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+							
+							v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
     									
 						}else{
 							vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8796,7 +8809,9 @@ module OneM2M_Testcases_CSE {
 						// Test adapter configuration
     				
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						if(p_resourceType != int2) {	//ResourceType != AE
+							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						}
 						
 						if(p_resourceType != int1) {
 							
@@ -8806,9 +8821,9 @@ module OneM2M_Testcases_CSE {
 						}
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE
 	
-						f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-						
-						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+							f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+							
+							v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
     									
 						}else{
 							vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));