Remove FlexRAN

- Remove any FlexRAN code
- Cleanup config files
- Remove LFDS7, libyaml dependencies

ci-scripts/Jenkinsfile-gitlab

@@ -54,10 +54,6 @@ pipeline {
                         echo "Platform is ${env.TESTPLATFORM_OWNER}"
                     }
 
-                    if (fileExists("flexran")) {
-                        sh "rm -Rf flexran > /dev/null 2>&1"
-                    }
-
                     echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
                     if ("MERGE".equals(env.gitlabActionType)) {
                         LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid

ci-scripts/checkAddedWarnings.sh

@@ -110,7 +110,7 @@ MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-sta
 NB_WARNINGS_FILES=0
 
 # Retrieve list of warnings 
-LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
+LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.txt | egrep -v "jobserver unavailable|Clock skew detected." | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
 
 echo ""
 echo "List of files that have been modified by the Merge Request AND"

ci-scripts/cls_containerize.py

@@ -188,8 +188,6 @@ class Containerize():
 
 		self.testCase_id = ''
 
-		self.flexranCtrlDeployed = False
-		self.flexranCtrlIpAddress = ''
 		self.cli = ''
 		self.cliBuildOptions = ''
 		self.dockerfileprefix = ''

ci-scripts/cls_oaicitest.py

@@ -299,50 +299,6 @@ class OaiCiTest():
 			HTML.CreateHtmlTabFooter(False)
 			self.ConditionalExit()
 
-	def CheckFlexranCtrlInstallation(self,RAN,EPC,CONTAINERS):
-		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '':
-			return
-		SSH = sshconnection.SSHConnection()
-		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command('ls -ls /opt/flexran_rtc/*/rt_controller', '\$', 5)
-		result = re.search('/opt/flexran_rtc/build/rt_controller', SSH.getBefore())
-		if result is not None:
-			RAN.flexranCtrlInstalled=True
-			RAN.flexranCtrlIpAddress=EPC.IPAddress
-			logging.debug('Flexran Controller is installed')
-		else:
-			# Maybe flexran-rtc is deployed into a container
-			SSH.command('docker inspect --format="FLEX_RTC_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-flexran-rtc', '\$', 5)
-			result = re.search('FLEX_RTC_IP_ADDR = (?P<flex_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is not None:
-				RAN.flexranCtrlDeployed=True
-				RAN.flexranCtrlIpAddress=result.group('flex_ip_addr')
-				CONTAINERS.flexranCtrlDeployed=True
-				CONTAINERS.flexranCtrlIpAddress=result.group('flex_ip_addr')
-				logging.debug('Flexran Controller is deployed: ' + RAN.flexranCtrlIpAddress)
-		SSH.close()
-
-	def InitializeFlexranCtrl(self, HTML,RAN,EPC):
-		if RAN.flexranCtrlInstalled == False:
-			return
-		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command('cd /opt/flexran_rtc', '\$', 5)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S rm -f log/*.log', '\$', 5)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S echo "build/rt_controller -c log_config/basic_log" > ./my-flexran-ctl.sh', '\$', 5)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S chmod 755 ./my-flexran-ctl.sh', '\$', 5)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S daemon --unsafe --name=flexran_rtc_daemon --chdir=/opt/flexran_rtc -o /opt/flexran_rtc/log/flexranctl_' + self.testCase_id + '.log ././my-flexran-ctl.sh', '\$', 5)
-		SSH.command('ps -aux | grep --color=never rt_controller', '\$', 5)
-		result = re.search('rt_controller -c ', SSH.getBefore())
-		if result is not None:
-			logging.debug('\u001B[1m Initialize FlexRan Controller Completed\u001B[0m')
-			RAN.flexranCtrlStarted=True
-		SSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-	
 	def InitializeUE_common(self, device_id, idx,COTS_UE):
 		try:
 			SSH = sshconnection.SSHConnection()
@@ -1464,27 +1420,8 @@ class OaiCiTest():
 			i += 1
 		for job in multi_jobs:
 			job.join()
-		if (RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted) or RAN.flexranCtrlDeployed:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-			SSH.command('curl http://' + RAN.flexranCtrlIpAddress + ':9999/stats | jq \'.\' > check_status_' + self.testCase_id + '.log 2>&1', '\$', 5)
-			SSH.command('cat check_status_' + self.testCase_id + '.log | jq \'.eNB_config[0].UE\' | grep -c rnti | sed -e "s#^#Nb Connected UE = #"', '\$', 5)
-			result = re.search('Nb Connected UE = (?P<nb_ues>[0-9]+)', SSH.getBefore())
-			passStatus = True
-			if result is not None:
-				nb_ues = int(result.group('nb_ues'))
-				htmlOptions = 'Nb Connected UE(s) to eNB = ' + str(nb_ues)
-				logging.debug('\u001B[1;37;44m ' + htmlOptions + ' \u001B[0m')
-				if self.expectedNbOfConnectedUEs > -1:
-					if nb_ues != self.expectedNbOfConnectedUEs:
-						passStatus = False
-			else:
-				htmlOptions = 'N/A'
-			SSH.close()
-		else:
-			passStatus = True
-			htmlOptions = 'N/A'
+		passStatus = True
+		htmlOptions = 'N/A'
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(htmlOptions, 'KO', CONST.ALL_PROCESSES_OK)
@@ -3145,8 +3082,6 @@ class OaiCiTest():
 					if logStatus < 0:
 						result = logStatus
 					RAN.eNBLogFiles[0]=''
-				if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
-					self.TerminateFlexranCtrl()
 			return result
 
 	def CheckOAIUEProcessExist(self, initialize_OAI_UE_flag,HTML,RAN):
@@ -3462,22 +3397,6 @@ class OaiCiTest():
 		return global_status
 
 
-	def TerminateFlexranCtrl(self,HTML,RAN,EPC):
-		if RAN.flexranCtrlInstalled == False or RAN.flexranCtrlStarted == False:
-			return
-		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S daemon --name=flexran_rtc_daemon --stop', '\$', 5)
-		time.sleep(1)
-		SSH.command('echo ' + EPC.Password + ' | sudo -S killall --signal SIGKILL rt_controller', '\$', 5)
-		time.sleep(1)
-		SSH.close()
-		RAN.flexranCtrlStarted=False
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
 	def TerminateUE_common(self, device_id, idx,COTS_UE):
 		try:
 			SSH = sshconnection.SSHConnection()
@@ -3628,13 +3547,6 @@ class OaiCiTest():
 					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
-		if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
-			self.testCase_id = 'AUTO-KILL-flexran-ctl'
-			HTML.testCase_id = self.testCase_id
-			self.desc = 'Automatic Termination of FlexRan CTL'
-			HTML.desc = self.desc
-			self.ShowTestID()
-			self.TerminateFlexranCtrl(HTML,RAN,EPC)
 		if CONTAINERS.yamlPath[0] != '':
 			self.testCase_id = 'AUTO-KILL-CONTAINERS'
 			HTML.testCase_id = self.testCase_id
@@ -3662,13 +3574,6 @@ class OaiCiTest():
 					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
-		if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
-			self.testCase_id = 'AUTO-KILL-flexran-ctl'
-			HTML.testCase_id = self.testCase_id
-			self.desc = 'Automatic Termination of FlexRan CTL'
-			HTML.desc = self.desc
-			self.ShowTestID()
-			self.TerminateFlexranCtrl(HTML,RAN,EPC)
 		if CONTAINERS.yamlPath[0] != '':
 			self.testCase_id = 'AUTO-KILL-CONTAINERS'
 			HTML.testCase_id = self.testCase_id
@@ -3712,9 +3617,6 @@ class OaiCiTest():
 				ueIdx += 1
 			cnt += 1
 
-		msg = "FlexRan Controller is connected to " + str(self.x2NbENBs) + " eNB(s)"
-		logging.debug(msg)
-		message += msg + '\n'
 		cnt = 0
 		while cnt < self.x2NbENBs:
 			msg = "   -- eNB: " + str(self.x2ENBBsIds[idx][cnt]) + " is connected to " + str(len(self.x2ENBConnectedUEs[idx][cnt])) + " UE(s)"
@@ -3736,65 +3638,7 @@ class OaiCiTest():
 		logging.debug(msg)
 		fullMessage += msg + '\n'
 		if self.x2_ho_options == 'network':
-			if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
-				self.x2ENBBsIds = []
-				self.x2ENBConnectedUEs = []
-				self.x2ENBBsIds.append([])
-				self.x2ENBBsIds.append([])
-				self.x2ENBConnectedUEs.append([])
-				self.x2ENBConnectedUEs.append([])
-				fullMessage += self.X2_Status(0, self.testCase_id + '_pre_ho.json') 
-
-				msg = "Activating the X2 Net control on each eNB"
-				logging.debug(msg)
-				fullMessage += msg + '\n'
-				eNB_cnt = self.x2NbENBs
-				cnt = 0
-				while cnt < eNB_cnt:
-					cmd = "curl -XPOST http://" + EPC.IPAddress + ":9999/rrc/x2_ho_net_control/enb/" + str(self.x2ENBBsIds[0][cnt]) + "/1"
-					logging.debug(cmd)
-					fullMessage += cmd + '\n'
-					subprocess.run(cmd, shell=True)
-					cnt += 1
-				# Waiting for the activation to be active
-				time.sleep(10)
-				msg = "Switching UE(s) from eNB to eNB"
-				logging.debug(msg)
-				fullMessage += msg + '\n'
-				cnt = 0
-				while cnt < eNB_cnt:
-					ueIdx = 0
-					while ueIdx < len(self.x2ENBConnectedUEs[0][cnt]):
-						cmd = "curl -XPOST http://" + EPC.IPAddress() + ":9999/rrc/ho/senb/" + str(self.x2ENBBsIds[0][cnt]) + "/ue/" + str(self.x2ENBConnectedUEs[0][cnt][ueIdx]) + "/tenb/" + str(self.x2ENBBsIds[0][eNB_cnt - cnt - 1])
-						logging.debug(cmd)
-						fullMessage += cmd + '\n'
-						subprocess.run(cmd, shell=True)
-						ueIdx += 1
-					cnt += 1
-				time.sleep(10)
-				# check
-				logging.debug("Checking the Status after X2 Handover")
-				fullMessage += self.X2_Status(1, self.testCase_id + '_post_ho.json') 
-				cnt = 0
-				x2Status = True
-				while cnt < eNB_cnt:
-					if len(self.x2ENBConnectedUEs[0][cnt]) == len(self.x2ENBConnectedUEs[1][cnt]):
-						x2Status = False
-					cnt += 1
-				if x2Status:
-					msg = "X2 Handover was successful"
-					logging.debug(msg)
-					fullMessage += msg + '</pre>'
-					html_queue.put(fullMessage)
-					HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
-				else:
-					msg = "X2 Handover FAILED"
-					logging.error(msg)
-					fullMessage += msg + '</pre>'
-					html_queue.put(fullMessage)
-					HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
-			else:
-				HTML.CreateHtmlTestRow('Cannot perform requested X2 Handover', 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRow('Cannot perform requested X2 Handover', 'KO', CONST.ALL_PROCESSES_OK)
 
 	def LogCollectBuild(self,RAN):
 		# Some pipelines are using "none" IP / Credentials

ci-scripts/conf_files/benetel-4g.conf

@@ -256,16 +256,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/cu.band7.tm1.100PRB.conf

@@ -203,15 +203,5 @@ log_config = {
   global_log_level            = "info";
   pdcp_log_level              = "info";
   rrc_log_level               = "info";
-  flexran_agent_log_level     = "info";
   gtp_log_level               = "info";
 };
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/cu.band7.tm1.25PRB.conf

@@ -203,15 +203,5 @@ log_config = {
   global_log_level            = "info";
   pdcp_log_level              = "info";
   rrc_log_level               = "info";
-  flexran_agent_log_level     = "info";
   gtp_log_level               = "info";
 };
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/cu.band7.tm1.50PRB.conf

@@ -203,15 +203,5 @@ log_config = {
   global_log_level            = "info";
   pdcp_log_level              = "info";
   rrc_log_level               = "info";
-  flexran_agent_log_level     = "info";
   gtp_log_level               = "info";
 };
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf

@@ -100,16 +100,6 @@ log_config = {
   phy_log_level               = "info";
   mac_log_level               = "info";
   rlc_log_level               = "info";
-  flexran_agent_log_level     = "info";
-};
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
 };
 
 THREAD_STRUCT = (

ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf

@@ -100,16 +100,6 @@ log_config = {
   phy_log_level               = "info";
   mac_log_level               = "info";
   rlc_log_level               = "info";
-  flexran_agent_log_level     = "info";
-};
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
 };
 
 THREAD_STRUCT = (

ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf

@@ -100,16 +100,6 @@ log_config = {
   phy_log_level               = "info";
   mac_log_level               = "info";
   rlc_log_level               = "info";
-  flexran_agent_log_level     = "info";
-};
-
-NETWORK_CONTROLLER : {
-  FLEXRAN_ENABLED        = "no";
-  FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-  FLEXRAN_PORT           = 2210;
-  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-  FLEXRAN_AWAIT_RECONF   = "no";
 };
 
 THREAD_STRUCT = (

ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf

@@ -235,16 +235,6 @@ RUs = (
     }
 );  
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"

ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf

@@ -437,16 +437,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf

@@ -247,16 +247,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf

@@ -391,16 +391,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf

@@ -251,16 +251,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf

@@ -251,16 +251,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf

@@ -251,16 +251,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -216,13 +216,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -216,13 +216,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -216,13 +216,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf

@@ -214,13 +214,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

@@ -243,16 +243,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf

@@ -252,16 +252,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

@@ -250,16 +250,6 @@ THREAD_STRUCT =
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 log_config :
 {
     global_log_level                      ="info";

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

@@ -251,15 +251,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf

@@ -251,16 +251,6 @@ THREAD_STRUCT =
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 log_config : 
   {
      global_log_level                      ="info"; 

ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf

@@ -245,16 +245,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf

@@ -240,16 +240,6 @@ RUs = (
     }
 );  
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"

ci-scripts/conf_files/lte-fdd-basic-sim.conf

@@ -244,16 +244,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf

@@ -393,16 +393,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf

@@ -393,16 +393,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/lte-tdd-basic-sim.conf

@@ -216,13 +216,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "ens3";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -223,13 +223,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -223,13 +223,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -223,13 +223,3 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

@@ -250,16 +250,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf

@@ -250,16 +250,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
 log_config :
 {
   global_log_level         ="info";

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

@@ -250,16 +250,6 @@ THREAD_STRUCT = (
   }
 );
 
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
      log_config :
      {
        global_log_level                      ="info";

ci-scripts/epc.py

@@ -638,10 +638,6 @@ class EPCManagement():
 		# Checking for additional services
 		mySSH.command('docker-compose config', '\$', 5)
 		configResponse = mySSH.getBefore()
-		if configResponse.count('flexran_rtc') == 1:
-			mySSH.command('docker-compose up -d flexran_rtc', '\$', 60)
-			listOfContainers += ' prod-flexran-rtc'
-			expectedHealthyContainers += 1
 		if configResponse.count('trf_gen') == 1:
 			mySSH.command('docker-compose up -d trf_gen', '\$', 60)
 			listOfContainers += ' prod-trf-gen'
@@ -760,9 +756,6 @@ class EPCManagement():
 		# Checking for additional services
 		mySSH.command('docker-compose config', '\$', 5)
 		configResponse = mySSH.getBefore()
-		if configResponse.count('flexran_rtc') == 1:
-			listOfContainers += ' prod-flexran-rtc'
-			nbContainers += 1
 		if configResponse.count('trf_gen') == 1:
 			listOfContainers += ' prod-trf-gen'
 			nbContainers += 1

ci-scripts/main.py

@@ -796,7 +796,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			logging.error('requested test is invalidly formatted: ' + test)
 			sys.exit(1)
 	if (EPC.IPAddress != '') and (EPC.IPAddress != 'none'):
-		CiTestObj.CheckFlexranCtrlInstallation(RAN,EPC,CONTAINERS)
 		EPC.SetMmeIPAddress()
 		EPC.SetAmfIPAddress()
 
@@ -943,10 +942,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					EPC.DeployEpc(HTML)
 				elif action == 'Undeploy_EPC':
 					EPC.UndeployEpc(HTML)
-				elif action == 'Initialize_FlexranCtrl':
-					CiTestObj.InitializeFlexranCtrl(HTML,RAN,EPC)
-				elif action == 'Terminate_FlexranCtrl':
-					CiTestObj.TerminateFlexranCtrl(HTML,RAN,EPC)
 				elif action == 'IdleSleep':
 					CiTestObj.IdleSleep(HTML)
 				elif action == 'Perform_X2_Handover':

ci-scripts/ran.py

@@ -85,10 +85,6 @@ class RANManagement():
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
 		self.eNBstatuses = [-1, -1, -1]
-		self.flexranCtrlInstalled = False
-		self.flexranCtrlStarted = False
-		self.flexranCtrlDeployed = False
-		self.flexranCtrlIpAddress = ''
 		self.testCase_id = ''
 		self.epcPcapFile = ''
 		self.runtime_stats= ''
@@ -443,11 +439,6 @@ class RANManagement():
 		mySSH.command('sed -i -e \'s/CI_RRU1_IP_ADDR/' + self.eNB1IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_RRU2_IP_ADDR/' + self.eNB2IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_FR1_CTL_ENB_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
-		if (self.flexranCtrlInstalled and self.flexranCtrlStarted) or self.flexranCtrlDeployed:
-			mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED        = "yes";/\' ' + ci_full_config_file, '\$', 2);
-			mySSH.command('sed -i -e \'s/CI_FLEXRAN_CTL_IP_ADDR/' + self.flexranCtrlIpAddress + '/\' ' + ci_full_config_file, '\$', 2);
-		else:
-			mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED        = "no";/\' ' + ci_full_config_file, '\$', 2);
 		self.eNBmbmsEnables[int(self.eNB_instance)] = False
 		mySSH.command('grep --colour=never enable_enb_m2 ' + ci_full_config_file, '\$', 2);
 		result = re.search('yes', mySSH.getBefore())

ci-scripts/reportBuildLocally.sh

@@ -53,7 +53,7 @@ function details_table {
     echo "        <th>Message</th>" >> $3
     echo "      </tr>" >> $3
 
-    LIST_MESSAGES=`egrep "error:|warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto|disabling jobserver mode"`
+    LIST_MESSAGES=`egrep "error:|warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|disabling jobserver mode"`
     COMPLETE_MESSAGE="start"
     for MESSAGE in $LIST_MESSAGES
     do
@@ -146,7 +146,7 @@ function summary_table_row {
         else
             echo "        <td bgcolor = \"red\" >$NB_ERRORS</th>" >> ./build_results.html
         fi
-        NB_WARNINGS=`egrep "warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto|disabling jobserver mode" | egrep -c "warning:"`
+        NB_WARNINGS=`egrep "warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|disabling jobserver mode" | egrep -c "warning:"`
         if [ $NB_WARNINGS -eq 0 ]
         then
             echo "        <td bgcolor = \"green\" >$NB_WARNINGS</th>" >> ./build_results.html

ci-scripts/xml_class_list.yml

@@ -20,8 +20,6 @@
   - Ping
   - Iperf
   - Reboot_UE
-  - Initialize_FlexranCtrl
-  - Terminate_FlexranCtrl
   - Deploy_EPC
   - Undeploy_EPC
   - Initialize_HSS

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
 	<htmlTabRef>test-05-tm1-rrc-w-flex</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity-FlexRan</htmlTabName>
+	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
@@ -70,19 +70,9 @@
 		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
 	</testCase>
 
-	<testCase id="050102">
-		<class>Initialize_FlexranCtrl</class>
-		<desc>Starting Flexran Controller</desc>
-	</testCase>
-
-	<testCase id="050202">
-		<class>Terminate_FlexranCtrl</class>
-		<desc>Stopping Flexran Controller</desc>
-	</testCase>
-
 	<testCase id="030103">
 		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing -- with FlexRan Ctl</desc>
+		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 	</testCase>
 

ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml

@@ -91,16 +91,6 @@
 		<eNB_serverId>1</eNB_serverId>
 	</testCase>
 
-	<testCase id="050102">
-		<class>Initialize_FlexranCtrl</class>
-		<desc>Starting Flexran Controller</desc>
-	</testCase>
-
-	<testCase id="050202">
-		<class>Terminate_FlexranCtrl</class>
-		<desc>Stopping Flexran Controller</desc>
-	</testCase>
-
 	<testCase id="040301">
 		<class>Attach_UE</class>
 		<desc>Attach UE</desc>
@@ -188,16 +178,4 @@
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 	</testCase>
 
-	<testCase id="050401">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
-	<testCase id="050402">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
 </testCaseList>

ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml

@@ -43,10 +43,4 @@
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 	</testCase>
-
-	<testCase id="050202">
-		<class>Terminate_FlexranCtrl</class>
-		<desc>Stopping Flexran Controller</desc>
-	</testCase>
-
 </testCaseList>

ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml

@@ -48,16 +48,6 @@
 		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
 	</testCase>
 
-	<testCase id="050102">
-		<class>Initialize_FlexranCtrl</class>
-		<desc>Starting Flexran Controller</desc>
-	</testCase>
-
-	<testCase id="050202">
-		<class>Terminate_FlexranCtrl</class>
-		<desc>Stopping Flexran Controller</desc>
-	</testCase>
-
 	<testCase id="030101">
 		<class>Initialize_eNB</class>
 		<desc>Initialize Master eNB (FDD/Band7/5MHz)</desc>
@@ -177,16 +167,4 @@
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
-	<testCase id="050401">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
-	<testCase id="050402">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
 </testCaseList>

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -203,9 +203,6 @@ services:
             ENB_INTERFACE_NAME_FOR_S1U: eth0
             ENB_IPV4_ADDRESS_FOR_S1U: 192.168.61.1
             ENB_IPV4_ADDRESS_FOR_X2C: 192.168.61.1
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.1
             LOCAL_S_IF_NAME: 'lo:'
             REMOTE_S_ADDRESS: 127.0.0.1
             LOCAL_S_ADDRESS: 127.0.0.2

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -206,9 +206,6 @@ services:
             ENB_S1U_IF_NAME: eth0
             ENB_S1U_IP_ADDRESS: 192.168.61.20
             ENB_X2_IP_ADDRESS: 192.168.61.20
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.10
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

@@ -28,9 +28,6 @@ services:
             ENB_S1U_IF_NAME: eth0
             ENB_S1U_IP_ADDRESS: 192.168.61.20
             ENB_X2_IP_ADDRESS: 192.168.61.20
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.10
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -206,9 +206,6 @@ services:
             ENB_S1U_IF_NAME: eth0
             ENB_S1U_IP_ADDRESS: 192.168.61.20
             ENB_X2_IP_ADDRESS: 192.168.61.20
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.10
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -206,9 +206,6 @@ services:
             ENB_S1U_IF_NAME: eth0
             ENB_S1U_IP_ADDRESS: 192.168.61.20
             ENB_X2_IP_ADDRESS: 192.168.61.20
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.10
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -205,9 +205,6 @@ services:
             F1_CU_IP_ADDRESS: 192.168.61.20
             S1U_IF_NAME: eth0
             F1_CU_IP_ADDRESS: 192.168.61.20
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 192.168.61.10
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"

ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml

@@ -24,9 +24,6 @@ services:
             ENB_S1U_IF_NAME: eth0
             ENB_S1U_IP_ADDRESS: 192.168.61.30
             ENB_X2_IP_ADDRESS: 192.168.61.30
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: CI_FLEXRAN_CTL_IP_ADDR
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].max_pdschReferenceSignalPower -27 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --log_config.global_log_options level,nocolor,time
         volumes:
             - /dev:/dev

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 172.21.18.46
             ENB_X2_IP_ADDRESS: 172.21.18.46
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 172.21.18.46
             ENB_X2_IP_ADDRESS: 172.21.18.46
             RRC_INACTIVITY_THRESHOLD: 30
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 172.21.18.46
             ENB_X2_IP_ADDRESS: 172.21.18.46
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 172.21.18.46
             ENB_X2_IP_ADDRESS: 172.21.18.46
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 172.21.18.46
             ENB_X2_IP_ADDRESS: 172.21.18.46
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml

@@ -27,9 +27,6 @@ services:
             ENB_S1U_IP_ADDRESS: 192.168.68.130
             ENB_X2_IP_ADDRESS: 192.168.68.130
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.16.136
             THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:

ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml

@@ -22,9 +22,6 @@ services:
             GNB_S1U_IP_ADDRESS: 192.168.68.194
             GNB_X2_IP_ADDRESS: 192.168.68.194
             RRC_INACTIVITY_THRESHOLD: 0
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: 172.21.16.136
             THREAD_PARALLEL_CONFIG: PARALLEL_RU_L1_TRX_SPLIT
             USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
         volumes: