Merge pull request #228 from Telecominfraproject/octal_ds_subbranch

add BW10_FREQs for b3 and b5
This commit is contained in:
dsaha26
2019-01-11 11:47:50 -08:00
committed by GitHub
3 changed files with 83 additions and 6 deletions

View File

@@ -35,13 +35,14 @@ class ConfigurationLoader():
self.load_config_file(os.path.join(self.root_folder, 'testbench', platform.node() + '.ini'), must_exist=False)
self.load_config_file(os.path.join(base_path, product_folder, '.test.ini'), must_exist=False)
# DSTest manually adding the below for calibration
#self.load_config_file(os.path.join(base_path, '.calib_const.ini'))
self.load_config_file(os.path.join(base_path, '.calib_const28.ini'))
self.load_config_file(os.path.join(base_path, '.calib_const.ini'))
#self.load_config_file(os.path.join(base_path, '.rf_band3.ini'))
#self.load_config_file(os.path.join(base_path, '.rf_band5.ini'))
self.load_config_file(os.path.join(base_path, '.rf_band28.ini'))
#self.load_config_file(os.path.join(base_path, 'system', '.test.ini'))
self.load_config_file(os.path.join(base_path, 'system', '.test28.ini'))
self.load_config_file(os.path.join(base_path, '.rf_band5.ini'))
#self.load_config_file(os.path.join(base_path, '.rf_band28.ini'))
#self.load_config_file(os.path.join(base_path, 'system', '.test3.ini'))
self.load_config_file(os.path.join(base_path, 'system', '.test5.ini'))
# self.load_config_file(os.path.join(base_path, 'system', '.test28.ini'))
def _get_test_type(self, test_type):
return self.ini_content.items(test_type)

View File

@@ -0,0 +1,38 @@
[CALIBRATION]
#Calib files
PREPROCESS_FOLDER = 'measures'
POSTPROCESS_FOLDER = 'calib'
POSTPROCESS_BW_SUB_FOLDER = 'bw'
FILE_NAME = 'cal.tgz'
REMOTE_CALIB_FOLDER = '/tmp/cal/calib'
REMOTE_CALIB_VALIDATION_FOLDER = '/tmp/cal_read/'
#Calibration points
BW5_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+3, RF_DL_TOP_FREQ-2, 1)
BW10_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 1)
BW20_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 1)
BW5_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+3, RF_UL_TOP_FREQ-2, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+5, RF_UL_TOP_FREQ-4, 1)
BW20_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+10, RF_UL_TOP_FREQ-9, 1)
LTE_BANDWIDTHS = [10, 5, 20]
# Bandwidth frequency ranges, add top freq to make sure it is included in the test.
BW5_FREQS = [1808, 1815, 1822, 1829, 1836, 1844, 1851, 1858, 1865, 1872, 1877]
BW10_FREQS = [1810, 1818, 1826, 1834, 1843, 1851, 1859, 1868, 1875]
BW20_FREQS = [1815, 1825, 1835, 1845, 1855, 1865, 1870]
#BW5_FREQS = [1808, 1877]
#BW10_FREQS = [1810, 1875]
#BW20_FREQS = [1815, 1870]
#BW5_FREQS = range(RF_DL_BOTTOM_FREQ+3, RF_DL_TOP_FREQ-2, 2) + [RF_DL_TOP_FREQ-3]
#BW10_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 3) + [RF_DL_TOP_FREQ-5]
#BW20_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 5) #+ [RF_DL_TOP_FREQ-10]
[VALIDATION]
BOTTOM_RANDOM = 1828
TOP_RANDOM = 1869

View File

@@ -0,0 +1,38 @@
[CALIBRATION]
#Calib files
PREPROCESS_FOLDER = 'measures'
POSTPROCESS_FOLDER = 'calib'
POSTPROCESS_BW_SUB_FOLDER = 'bw'
FILE_NAME = 'cal.tgz'
REMOTE_CALIB_FOLDER = '/tmp/cal/calib'
REMOTE_CALIB_VALIDATION_FOLDER = '/tmp/cal_read/'
#Calibration points
BW5_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+3, RF_DL_TOP_FREQ-2, 1)
BW10_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 1)
BW20_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 1)
BW5_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+3, RF_UL_TOP_FREQ-2, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+5, RF_UL_TOP_FREQ-4, 1)
BW20_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+10, RF_UL_TOP_FREQ-9, 1)
LTE_BANDWIDTHS = [10, 5, 20]
# Bandwidth frequency ranges, add top freq to make sure it is included in the test.
BW5_FREQS = [1860, 1815, 1822, 1829, 1836, 1844, 1851, 1858, 1865, 1872, 1877]
BW10_FREQS = [869, 872, 875, 878, 881, 884, 887, 890, 894]
BW20_FREQS = [1815, 1825, 1835, 1845, 1855, 1865, 1870]
#BW5_FREQS = [1808, 1877]
#BW10_FREQS = [1810, 1875]
#BW20_FREQS = [1815, 1870]
#BW5_FREQS = range(RF_DL_BOTTOM_FREQ+3, RF_DL_TOP_FREQ-2, 2) + [RF_DL_TOP_FREQ-3]
#BW10_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 3) + [RF_DL_TOP_FREQ-5]
#BW20_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 5) #+ [RF_DL_TOP_FREQ-10]
[VALIDATION]
BOTTOM_RANDOM = 871
TOP_RANDOM = 890