ctrl/bsc: Fix copy and paste error and update text
30f1f37638
introduced new channel
combinations but had a copy and paste error in the description.
The jenkins system didn't run the external tests so this issue
and others were not noticed until now.
Fix the copy and paste and update the test result.
This commit is contained in:
parent
7af5f8130f
commit
b8c204cb92
|
@ -248,6 +248,8 @@ static int get_bts_chan_load(struct ctrl_cmd *cmd, void *data)
|
|||
continue;
|
||||
if (i == GSM_PCHAN_PDCH)
|
||||
continue;
|
||||
if (i == GSM_PCHAN_UNKNOWN)
|
||||
continue;
|
||||
|
||||
cmd->reply = talloc_asprintf_append(cmd->reply,
|
||||
"%s%s,%u,%u",
|
||||
|
|
|
@ -62,7 +62,7 @@ const struct value_string gsm_pchant_names[12] = {
|
|||
{ GSM_PCHAN_TCH_F_PDCH, "TCH/F_PDCH" },
|
||||
{ GSM_PCHAN_UNKNOWN, "UNKNOWN" },
|
||||
{ GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" },
|
||||
{ GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH8+CBCH" },
|
||||
{ GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
@ -78,7 +78,7 @@ const struct value_string gsm_pchant_descs[12] = {
|
|||
{ GSM_PCHAN_TCH_F_PDCH, "Dynamic TCH/F or GPRS PDCH" },
|
||||
{ GSM_PCHAN_UNKNOWN, "Unknown / Unsupported channel combination" },
|
||||
{ GSM_PCHAN_CCCH_SDCCH4_CBCH, "FCCH + SCH + BCCH + CCCH + CBCH + 3 SDCCH + 2 SACCH (Comb. V)" },
|
||||
{ GSM_PCHAN_SDCCH8_SACCH8C, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" },
|
||||
{ GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
|
@ -234,7 +234,7 @@ class TestCtrlBSC(TestCtrlBase):
|
|||
# No RSL link so everything is 0
|
||||
r = self.do_get('bts.0.channel-load')
|
||||
self.assertEquals(r['mtype'], 'GET_REPLY')
|
||||
self.assertEquals(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0')
|
||||
self.assertEquals(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0 SDCCH8+CBCH,0,0')
|
||||
|
||||
def testBtsOmlConnectionState(self):
|
||||
"""Check OML state. It will not be connected"""
|
||||
|
|
Loading…
Reference in New Issue