osmo-bsc: Parametrize codec-list VTY cfg
Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0
This commit is contained in:
parent
c264d3df9d
commit
5dc245938b
|
@ -14,6 +14,8 @@ bsc:
|
||||||
short_name: osmo-gsm-tester-msc
|
short_name: osmo-gsm-tester-msc
|
||||||
long_name: osmo-gsm-tester-msc
|
long_name: osmo-gsm-tester-msc
|
||||||
encryption: a5_0
|
encryption: a5_0
|
||||||
|
codec_list:
|
||||||
|
- hr3
|
||||||
|
|
||||||
msc:
|
msc:
|
||||||
net:
|
net:
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- fr1
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- fr2
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- fr3
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- hr1
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- hr2
|
|
@ -0,0 +1,5 @@
|
||||||
|
config:
|
||||||
|
bsc:
|
||||||
|
net:
|
||||||
|
codec_list:
|
||||||
|
- hr3
|
|
@ -87,7 +87,8 @@ WANT_SCHEMA = util.dict_add(
|
||||||
RESOURCES_SCHEMA)
|
RESOURCES_SCHEMA)
|
||||||
|
|
||||||
CONF_SCHEMA = util.dict_add(
|
CONF_SCHEMA = util.dict_add(
|
||||||
{ 'defaults.timeout': schema.STR },
|
{ 'defaults.timeout': schema.STR,
|
||||||
|
'config.bsc.net.codec_list[]': schema.CODEC },
|
||||||
dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]),
|
dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]),
|
||||||
dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()]))
|
dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()]))
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,11 @@ def channel_allocator(val):
|
||||||
return
|
return
|
||||||
raise ValueError('Unknown Channel Allocator Policy %r' % val)
|
raise ValueError('Unknown Channel Allocator Policy %r' % val)
|
||||||
|
|
||||||
|
def codec(val):
|
||||||
|
if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'):
|
||||||
|
return
|
||||||
|
raise ValueError('Unknown Codec value: %r' % val)
|
||||||
|
|
||||||
INT = 'int'
|
INT = 'int'
|
||||||
STR = 'str'
|
STR = 'str'
|
||||||
UINT = 'uint'
|
UINT = 'uint'
|
||||||
|
@ -126,6 +131,7 @@ CIPHER = 'cipher'
|
||||||
MODEM_FEATURE = 'modem_feature'
|
MODEM_FEATURE = 'modem_feature'
|
||||||
PHY_CHAN = 'chan'
|
PHY_CHAN = 'chan'
|
||||||
CHAN_ALLOCATOR = 'chan_allocator'
|
CHAN_ALLOCATOR = 'chan_allocator'
|
||||||
|
CODEC = 'codec'
|
||||||
|
|
||||||
SCHEMA_TYPES = {
|
SCHEMA_TYPES = {
|
||||||
INT: int,
|
INT: int,
|
||||||
|
@ -144,6 +150,7 @@ SCHEMA_TYPES = {
|
||||||
MODEM_FEATURE: modem_feature,
|
MODEM_FEATURE: modem_feature,
|
||||||
PHY_CHAN: phy_channel_config,
|
PHY_CHAN: phy_channel_config,
|
||||||
CHAN_ALLOCATOR: channel_allocator,
|
CHAN_ALLOCATOR: channel_allocator,
|
||||||
|
CODEC: codec,
|
||||||
}
|
}
|
||||||
|
|
||||||
def validate(config, schema):
|
def validate(config, schema):
|
||||||
|
|
|
@ -110,7 +110,7 @@ msc
|
||||||
mgw remote-port 2427
|
mgw remote-port 2427
|
||||||
mgw local-ip ${bsc.ip_address.addr}
|
mgw local-ip ${bsc.ip_address.addr}
|
||||||
mgw endpoint-range 1 31
|
mgw endpoint-range 1 31
|
||||||
codec-list hr3
|
codec-list ${' '.join(bsc.net.codec_list)}
|
||||||
amr-config 12_2k forbidden
|
amr-config 12_2k forbidden
|
||||||
amr-config 10_2k forbidden
|
amr-config 10_2k forbidden
|
||||||
amr-config 7_95k forbidden
|
amr-config 7_95k forbidden
|
||||||
|
|
Loading…
Reference in New Issue