From b398a70abd072e6344a660863521821813fb4553 Mon Sep 17 00:00:00 2001 From: dsaha26 Date: Fri, 18 Jan 2019 11:55:36 -0800 Subject: [PATCH] properly set test equipment IPs, avoid writing results to EEPROM --- .../rf_card_cal_tip/im_calibration.py | 1 + octal/cavium_env/rf_card_cal_tip/main.py | 23 ------------------- .../cavium_env/rf_card_cal_tip/test_config.py | 23 +++++++++++++++++-- .../rf_card_cal_tip/test_config.txt | 4 ++-- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/octal/cavium_env/rf_card_cal_tip/im_calibration.py b/octal/cavium_env/rf_card_cal_tip/im_calibration.py index b09f33e377..67739781bf 100644 --- a/octal/cavium_env/rf_card_cal_tip/im_calibration.py +++ b/octal/cavium_env/rf_card_cal_tip/im_calibration.py @@ -13,6 +13,7 @@ pp_base = '>' # prompt base for tn_write class Calibration(object): cfg = test_config.EnbConfig() + cfg.set_test_equipment() enb = enodeb_ctrl.enodeB_Ctrl() if (cfg.test_set == 'agilent'): diff --git a/octal/cavium_env/rf_card_cal_tip/main.py b/octal/cavium_env/rf_card_cal_tip/main.py index f28335c9b9..ddc0491fa2 100644 --- a/octal/cavium_env/rf_card_cal_tip/main.py +++ b/octal/cavium_env/rf_card_cal_tip/main.py @@ -427,26 +427,6 @@ class rfCardCal(): return self.enb.enb_eeprom_get_earfcn_dl() """ pass - - - def set_test_equipment(self): - correct_ipaddr = 'n' - while (correct_ipaddr != 'y'): - print("\nSelected exg ipaddr = " + self.cfg.exg_ipaddr) - correct_ipaddr = raw_input("Is this the correct exg ipaddr?(y/n):") - if (correct_ipaddr == 'y') or (correct_ipaddr == 'Y'): - break - else: - self.cfg.exg_ipaddr = raw_input("Please enter the correct exg ipaddr:") - - correct_ipaddr = 'n' - while (correct_ipaddr != 'y'): - print("\nSelected mxa ipaddr = " + self.cfg.mxa_ipaddr) - correct_ipaddr = raw_input("Is this the correct mxa ipaddr?(y/n):") - if (correct_ipaddr == 'y') or (correct_ipaddr == 'Y'): - break - else: - self.cfg.mxa_ipaddr = raw_input("Please enter the correct mxa ipaddr:") def set_initial_frequency(self): @@ -478,8 +458,6 @@ class rfCardCal(): print "\nUsing the following configuration:" print "Band " + str(test_config.band) - print "EXG ip addr " + self.cfg.exg_ipaddr - print "MXA ip addr " + self.cfg.mxa_ipaddr print "DL freq. " + str(test_config.dl_freq) + " MHz" print "UL freq. " + str(test_config.ul_freq) + " MHz" @@ -591,7 +569,6 @@ class rfCardCal(): self.enb.enb_login() def run(self): - self.set_test_equipment() self.set_initial_frequency() # for non-testall items self.enb.start_telnet_session() self.enb.enb_login() diff --git a/octal/cavium_env/rf_card_cal_tip/test_config.py b/octal/cavium_env/rf_card_cal_tip/test_config.py index 4f41e3bbae..c3a84d1042 100644 --- a/octal/cavium_env/rf_card_cal_tip/test_config.py +++ b/octal/cavium_env/rf_card_cal_tip/test_config.py @@ -73,7 +73,7 @@ class EnbConfig(): self.cr_txevm_max = 3.5 # maximum TX EVM limit # system variables - self.en_eeprom_write = True # disable when refkit1 + self.en_eeprom_write = False # disable when refkit1 self.eeprom_record_ver = 1 # EEPROM record version self.test_report = True # T: enable test report; F: disable self.instr_disp = True # T: enable instrument screen display @@ -106,7 +106,26 @@ class EnbConfig(): self.select_rf_drv_init() self.select_dl_etm_test_vector() self.select_ul_exg_waveform() - + + def set_test_equipment(self): + correct_ipaddr = 'n' + while (correct_ipaddr != 'y'): + print("\nSelected exg ipaddr = " + self.exg_ipaddr) + correct_ipaddr = raw_input("Is this the correct exg ipaddr?(y/n):") + if (correct_ipaddr == 'y') or (correct_ipaddr == 'Y'): + break + else: + self.exg_ipaddr = raw_input("Please enter the correct exg ipaddr:") + + correct_ipaddr = 'n' + while (correct_ipaddr != 'y'): + print("\nSelected mxa ipaddr = " + self.mxa_ipaddr) + correct_ipaddr = raw_input("Is this the correct mxa ipaddr?(y/n):") + if (correct_ipaddr == 'y') or (correct_ipaddr == 'Y'): + break + else: + self.mxa_ipaddr = raw_input("Please enter the correct mxa ipaddr:") + def check_cfg_file(self): cfgfile = open(self.cfg_file, "r") diff --git a/octal/cavium_env/rf_card_cal_tip/test_config.txt b/octal/cavium_env/rf_card_cal_tip/test_config.txt index a281d7804e..4405e38d1a 100644 --- a/octal/cavium_env/rf_card_cal_tip/test_config.txt +++ b/octal/cavium_env/rf_card_cal_tip/test_config.txt @@ -38,7 +38,7 @@ manual_switch_instr=False # T: pause for manual switching; F: continuous test_set='agilent' # test set type [agilent, anritsu, rs] # agilent test set -exg_ipaddr='10.115.115.38' # EXG IP address +exg_ipaddr='10.102.81.38' # EXG IP address exg_tcp_port=5025 # EXG TCP port mxa_ipaddr='10.102.81.200' # MXA IP address mxa_tcp_port=5025 # MXA TCP port @@ -63,7 +63,7 @@ cr_txpwr_max=22 # maximum TX output power limit cr_txevm_max=5.0 # maximum TX EVM limit # system variables -en_eeprom_write=True # T: write EEPROM +en_eeprom_write=False # T: write EEPROM eeprom_record_ver=1 # EEPROM record version test_report=True # T: enable test report; F: disable instr_disp=True # T: enable instrument screen display