Remove all references to CatM

ci-scripts/main.py

@@ -307,7 +307,7 @@ def GetParametersFromXML(action):
 			#CiTestObj.air_interface = 'ocp-enb'
 			logging.error('OCP UE -- NOT SUPPORTED')
 
-	elif (action == 'Ping') or (action == 'Ping_CatM_module'):
+	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		ue_id = test.findtext('id')
@@ -713,12 +713,6 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
 	if foundCount != HTML.nbTestXMLfiles:
 		HTML.nbTestXMLfiles=foundCount
 	
-	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
-		terminate_ue_flag = False
-		CiTestObj.GetAllUEDevices(terminate_ue_flag)
-		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
-		HTML.htmlNb_Smartphones=len(CiTestObj.UEDevices)
-		HTML.htmlNb_CATM_Modules=len(CiTestObj.CatMDevices)
 	HTML.CreateHtmlHeader(CiTestObj.ADBIPAddress)
 elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
@@ -816,7 +810,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
 		terminate_ue_flag = False
 		CiTestObj.GetAllUEDevices(terminate_ue_flag)
-		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
 	elif (CiTestObj.ADBIPAddress == 'modules'):
 		CiTestObj.UEDevices.append('COTS-Module')
 	else:
@@ -911,16 +904,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
 				elif action == 'Terminate_OAI_UE':
 					CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				elif action == 'Initialize_CatM_module':
-					CiTestObj.InitializeCatM(HTML)
-				elif action == 'Terminate_CatM_module':
-					CiTestObj.TerminateCatM(HTML)
-				elif action == 'Attach_CatM_module':
-					CiTestObj.AttachCatM(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				elif action == 'Detach_CatM_module':
-					CiTestObj.TerminateCatM(HTML)
-				elif action == 'Ping_CatM_module':
-					CiTestObj.PingCatM(HTML,RAN,EPC,COTS_UE,EPC,InfraUE,CONTAINERS)
 				elif action == 'Ping':
 					CiTestObj.Ping(HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS)
 				elif action == 'Iperf':

ci-scripts/xml_class_list.yml

@@ -31,11 +31,6 @@
   - Terminate_SPGW
   - Initialize_5GCN
   - Terminate_5GCN
-  - Initialize_CatM_module
-  - Terminate_CatM_module
-  - Attach_CatM_module
-  - Detach_CatM_module
-  - Ping_CatM_module
   - IdleSleep
   - Perform_X2_Handover
   - Build_Image

ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml

@@ -25,16 +25,10 @@
 	<htmlTabName>EPC-Closure</htmlTabName>
 	<htmlTabIcon>log-out</htmlTabIcon>
 	<TestCaseRequestedList>
- 040202
  050201 060201 070201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
 	<testCase id="050201">
 		<class>Terminate_HSS</class>
 		<desc>Terminate HSS</desc>

ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml

@@ -28,8 +28,7 @@
 	<TestUnstable>True</TestUnstable>
 	<TestCaseRequestedList>
  030201
- 040102
- 030121 000001 040302 000001 040502 000001 040402 040202 000001 030201
+ 030121 000001 000001 000001 040402 000001 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
@@ -51,31 +50,4 @@
 		<desc>Terminate eNB</desc>
 	</testCase>
 
-	<testCase id="040102">
-		<class>Initialize_CatM_module</class>
-		<desc>Initialize CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_CatM_module</class>
-		<desc>Attach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040402">
-		<class>Detach_CatM_module</class>
-		<desc>Detach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping_CatM_module</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
 </testCaseList>

ci-scripts/xml_files/test_case_list_template.xml

@@ -108,28 +108,6 @@
 		<desc>Reboot UE</desc>
 	</testCase>
 
-	<!-- CAT-M UE class command references -->
-
-	<testCase id="040102">
-		<class>Initialize_CatM_module</class>
-		<desc>Initialize CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_CatM_module</class>
-		<desc>Attach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040402">
-		<class>Detach_CatM_module</class>
-		<desc>Detach CAT-M Module</desc>
-	</testCase>
-
 	<!-- EPC class command references -->
 
         <testCase id="050101">