March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-dev[master]: gen_makefile.py: follow symlinks with find

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27445 ) Change subject: gen_makefile.py: follow symlinks with find ...................................................................... gen_makefile.py: follow symlinks with find Prepare for the next patch, with which {src_proj} may be a subdir in osmocom-bb. Change-Id: Ie15e74e61b16cef5e189e4e2a272b7d2061547c6 --- M gen_makefile.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/45/27445/1 diff --git a/gen_makefile.py b/gen_makefile.py index 03523df..2e9cc24 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -173,12 +173,12 @@ return r''' ### {proj} ### -{proj}_configure_files := $(shell find {src_proj} \ +{proj}_configure_files := $(shell find -L {src_proj} \ -name "Makefile.am" \ -or -name "*.in" \ -and -not -name "Makefile.in" \ -and -not -name "config.h.in" 2>/dev/null) -{proj}_files := $(shell find {src_proj} \ +{proj}_files := $(shell find -L {src_proj} \ \( \ -name "*.[hc]" \ -or -name "*.py" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ie15e74e61b16cef5e189e4e2a272b7d2061547c6 Gerrit-Change-Number: 27445 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: support running osmo-bts-virtual

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27442 ) Change subject: net/templates: support running osmo-bts-virtual ...................................................................... net/templates: support running osmo-bts-virtual New config variables: * BTS0_RUN_IN_OSMO_DEV * BTS0_IP * BTS1_RUN_IN_OSMO_DEV * BTS1_IP Change-Id: Ibc8efe75abffcefc0a719b6323a9ceca39f14ea1 --- M net/README M net/config_2g3g R net/templates/osmo-bts-0.cfg A net/templates/osmo-bts-1.cfg M net/templates/run.sh 5 files changed, 39 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/42/27442/1 diff --git a/net/README b/net/README index 696a803..3ca15fe 100644 --- a/net/README +++ b/net/README @@ -149,11 +149,14 @@ === 2G BTS -At the time of writing, there are no osmo-bts.cfg files, since this is intended -for the core network and BSC components only. Feel free to add! +You can either let osmo-dev run osmo-bts-virtual, or connect a real BTS to the +BSC + CN started by osmo-dev. -Typically you'd need to edit only the /etc/osmocom/osmo-bts.cfg to match your -IP address and ipa unit-id: +To start osmo-bts-virtual, set BTS0_RUN_IN_OSMO_DEV=1 and/or +BTS1_RUN_IN_OSMO_DEV=1 in your copy of config_2g3g. + +To connect your real BTS, typically you'd need to edit only the +/etc/osmocom/osmo-bts.cfg to match your IP address and ipa unit-id: bts 0 oml remote-ip 192.168.0.23 diff --git a/net/config_2g3g b/net/config_2g3g index eb43e03..bc0ced3 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -39,6 +39,9 @@ BTS0_MAX_POWER_RED=${BTS_MAX_POWER_RED} BTS0_NOMINAL_POWER=${BTS_200mW} BTS0_CODEC_SUPPORT=${BTS_CODEC_SUPPORT} +# set to 1 to have osmo-dev run osmo-bts-virtual +BTS0_RUN_IN_OSMO_DEV=0 +BTS0_IP="127.0.0.12" BTS1_DESCRIPTION="my test BTS 1" BTS1_IPA_UNIT="1 0" @@ -56,6 +59,9 @@ BTS1_MAX_POWER_RED=${BTS_MAX_POWER_RED} BTS1_NOMINAL_POWER=${BTS_200mW} BTS1_CODEC_SUPPORT=${BTS_CODEC_SUPPORT} +# set to 1 to have osmo-dev run osmo-bts-virtual +BTS1_RUN_IN_OSMO_DEV=0 +BTS1_IP="127.0.0.13" HLR_IP=127.0.0.5 diff --git a/net/templates/osmo-bts.cfg b/net/templates/osmo-bts-0.cfg similarity index 71% rename from net/templates/osmo-bts.cfg rename to net/templates/osmo-bts-0.cfg index 1d3e6a9..f6fd3ac 100644 --- a/net/templates/osmo-bts.cfg +++ b/net/templates/osmo-bts-0.cfg @@ -4,3 +4,9 @@ bts 0 ipa unit-id ${BTS0_IPA_UNIT} oml remote-ip ${BSC0_IP} + +ctrl + bind ${BTS0_IP} + +line vty + bind ${BTS0_IP} diff --git a/net/templates/osmo-bts-1.cfg b/net/templates/osmo-bts-1.cfg new file mode 100644 index 0000000..e4e3c64 --- /dev/null +++ b/net/templates/osmo-bts-1.cfg @@ -0,0 +1,12 @@ +${include(common_template_warning)} +${include(common_osmo_bts)} + +bts 0 + ipa unit-id ${BTS1_IPA_UNIT} + oml remote-ip ${BSC1_IP} + +ctrl + bind ${BTS1_IP} + +line vty + bind ${BTS1_IP} diff --git a/net/templates/run.sh b/net/templates/run.sh index 3430966..42b1eb4 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -181,6 +181,7 @@ stp4ran="osmo-stp -c osmo-stp-ran.cfg" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" +bts="osmo-bts-virtual" if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" @@ -272,6 +273,13 @@ term "$bsc -c osmo-bsc-1.cfg" BSC1 fi +${foreach(BTS)} +if [ "${BTSn_RUN_IN_OSMO_DEV}" = 1 ]; then + term "$bts -c osmo-bts-${BTSn}.cfg" BTS${BTSn} +fi +${foreach_end} + + if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 term "$sipcon" SIPCON -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ibc8efe75abffcefc0a719b6323a9ceca39f14ea1 Gerrit-Change-Number: 27442 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: don't sleep .2 for tmux

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27443 ) Change subject: net/templates/run.sh: don't sleep .2 for tmux ...................................................................... net/templates/run.sh: don't sleep .2 for tmux It doesn't seem necessary to do the "sleep .2" for tmux, so only do it when starting with regular terminals. Change-Id: I70931922aac56dad3d1e4dec67ca2b78d7cca7ff --- M net/templates/run.sh 1 file changed, 1 insertion(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/27443/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 42b1eb4..cda7fc0 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -131,6 +131,7 @@ tmux new-window -d -n "$title" "$launcher &; echo \$! > $pidfile_term; wait" ;; *) + sleep .2 $terminal \ -title "CN:$title" \ -e sh -c "$launcher" \ @@ -226,50 +227,28 @@ term "$ggsn" GGSN if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then - sleep .2 term "$stp4cn" STP else - sleep .2 term "$stp4cn" STP4CN - - sleep .2 term "$stp4ran" STP4RAN - - sleep .2 term "$bscnat" BSCNAT fi -sleep .2 term "$hlr" HLR - -sleep .2 term "$sgsn" SGSN - -sleep .2 term "$gbproxy" GBPROXY - -sleep .2 term "$mgw4msc" MGW4MSC - -sleep .2 term "$msc" MSC - -sleep 2 term "$hnbgw" HNBGW -sleep .2 if [ "$BSC_COUNT" = 1 ]; then term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC - sleep .2 term "$bsc -c osmo-bsc-0.cfg" BSC else term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 - sleep .2 term "$mgw4bsc -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 - sleep .2 term "$bsc -c osmo-bsc-0.cfg" BSC0 - sleep .2 term "$bsc -c osmo-bsc-1.cfg" BSC1 fi @@ -281,10 +260,8 @@ if [ "x${MSC_MNCC}" != "xinternal" ]; then - sleep .2 term "$sipcon" SIPCON - sleep .2 case "${PBX_SERVER}" in "kamailio") term "$kamailio" KAMAILIO -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I70931922aac56dad3d1e4dec67ca2b78d7cca7ff Gerrit-Change-Number: 27443 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bts.cfg: modernize

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27439 ) Change subject: net/templates/osmo-bts.cfg: modernize ...................................................................... net/templates/osmo-bts.cfg: modernize Move logging section to the bottom, include common_logging and common_template_warning. Change-Id: I7b29c644b53e4f1907f33664d6cde6ec76cc8c04 --- M net/templates/osmo-bts.cfg 1 file changed, 16 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/39/27439/1 diff --git a/net/templates/osmo-bts.cfg b/net/templates/osmo-bts.cfg index 73bbed6..7feb399 100644 --- a/net/templates/osmo-bts.cfg +++ b/net/templates/osmo-bts.cfg @@ -1,29 +1,13 @@ -! -! OsmoBTS () configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging print category 1 - logging print category-hex 0 - logging print level 1 - logging print file basename last - logging print extended-timestamp 1 - logging level set-all notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error -! +${include(common_template_warning)} + line vty no login -! + phy 0 instance 0 osmotrx ip local 127.0.0.1 osmotrx ip remote 127.0.0.1 + bts 0 band ${BTS_BAND} ipa unit-id ${BTS0_IPA_UNIT} @@ -32,3 +16,15 @@ gsmtap-sapi pdtch trx 0 phy 0 instance 0 + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level set-all notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error +${foreach_end} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I7b29c644b53e4f1907f33664d6cde6ec76cc8c04 Gerrit-Change-Number: 27439 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: split off common osmo-bts.cfg part

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27440 ) Change subject: net/templates: split off common osmo-bts.cfg part ...................................................................... net/templates: split off common osmo-bts.cfg part Change-Id: I4d318942ef07c246e05fd1c59ff0b32c219a45e1 --- A net/templates/common_osmo_bts M net/templates/osmo-bts.cfg 2 files changed, 27 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/40/27440/1 diff --git a/net/templates/common_osmo_bts b/net/templates/common_osmo_bts new file mode 100644 index 0000000..cfd28fb --- /dev/null +++ b/net/templates/common_osmo_bts @@ -0,0 +1,26 @@ +line vty + no login + +phy 0 + instance 0 + osmotrx ip local 127.0.0.1 + osmotrx ip remote 127.0.0.1 + +bts 0 + band ${BTS_BAND} + gsmtap-sapi ccch + gsmtap-sapi pdtch + trx 0 + phy 0 instance 0 + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level set-all notice + logging level meas error + logging level pag error + logging level l1c error + logging level l1p error + logging level dsp error + logging level abis error +${foreach_end} diff --git a/net/templates/osmo-bts.cfg b/net/templates/osmo-bts.cfg index 7feb399..1d3e6a9 100644 --- a/net/templates/osmo-bts.cfg +++ b/net/templates/osmo-bts.cfg @@ -1,30 +1,6 @@ ${include(common_template_warning)} - -line vty - no login - -phy 0 - instance 0 - osmotrx ip local 127.0.0.1 - osmotrx ip remote 127.0.0.1 +${include(common_osmo_bts)} bts 0 - band ${BTS_BAND} ipa unit-id ${BTS0_IPA_UNIT} oml remote-ip ${BSC0_IP} - gsmtap-sapi ccch - gsmtap-sapi pdtch - trx 0 - phy 0 instance 0 - -${foreach(LOG_OUTPUT)} -log ${LOG_OUTPUTn_TYPE} -${include(common_logging)} - logging level set-all notice - logging level meas error - logging level pag error - logging level l1c error - logging level l1p error - logging level dsp error - logging level abis error -${foreach_end} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I4d318942ef07c246e05fd1c59ff0b32c219a45e1 Gerrit-Change-Number: 27440 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/common_osmo_bts: drop osmotrx ip

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27441 ) Change subject: net/templates/common_osmo_bts: drop osmotrx ip ...................................................................... net/templates/common_osmo_bts: drop osmotrx ip Don't attempt to configure phy0 / osmotrx ip. This only works with osmo-bts-trx, not with osmo-bts-virtual which we'll run in osmo-dev. Besides that, 127.0.0.1 seems to be the default anyway. Change-Id: I20984d00623f31ce9c58a1dc91bcf53d4aec78b2 --- M net/templates/common_osmo_bts 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/41/27441/1 diff --git a/net/templates/common_osmo_bts b/net/templates/common_osmo_bts index cfd28fb..4244e34 100644 --- a/net/templates/common_osmo_bts +++ b/net/templates/common_osmo_bts @@ -3,8 +3,6 @@ phy 0 instance 0 - osmotrx ip local 127.0.0.1 - osmotrx ip remote 127.0.0.1 bts 0 band ${BTS_BAND} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I20984d00623f31ce9c58a1dc91bcf53d4aec78b2 Gerrit-Change-Number: 27441 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: split off common osmo-bsc.cfg part

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27436 ) Change subject: net/templates: split off common osmo-bsc.cfg part ...................................................................... net/templates: split off common osmo-bsc.cfg part Prepare to add support running with two osmo-bsc's in order to test osmo-bsc-nat. Change-Id: Icb220657888b23ca19546cca78e10ae914f37751 --- A net/templates/common_osmo_bsc M net/templates/osmo-bsc.cfg 2 files changed, 101 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/36/27436/1 diff --git a/net/templates/common_osmo_bsc b/net/templates/common_osmo_bsc new file mode 100644 index 0000000..ad229ed --- /dev/null +++ b/net/templates/common_osmo_bsc @@ -0,0 +1,98 @@ +stats interval 5 + +stats reporter statsd + disable + remote-ip ${STATSD_IP} + remote-port 9125 + level global + no prefix + enable + +line vty + no login + +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive + +msc 0 + allow-emergency deny + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k allowed + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden + +network + network country code ${MCC} + mobile network code ${MNC} + encryption a5 ${ENCR_A5} + neci 1 + paging any use tch 0 + handover 0 + periodic location update 12 + meas-feed destination 127.0.0.1 8888 + +${foreach(BTS)} + bts ${BTSn} + description ${BTSn_DESCRIPTION} + type osmo-bts + band ${BTS_BAND} + ip.access unit_id ${BTSn_IPA_UNIT} + location_area_code ${BTSn_LAC} + cell_identity ${BTSn_CI} + base_station_id_code ${BTSn_BSIC} + codec-support ${BTSn_CODEC_SUPPORT} + amr tch-f modes 3 + amr tch-f start-mode 3 + amr tch-h modes 3 + amr tch-h start-mode 3 + gprs mode ${BTSn_GPRS_MODE} + gprs nsvc 0 remote ip ${BTSn_GB_REMOTE_IP} + gprs nsvc 0 remote udp port ${BTSn_GB_REMOTE_PORT} + gprs nsvc 0 local udp port ${PCU_GB_LOCAL_PORT} + gprs nsvc 0 nsvci ${BTSn_NSVCI} + gprs nsei ${BTSn_NSEI} + gprs cell bvci ${BTSn_BVCI} + trx 0 + arfcn ${BTSn_ARFCN} + description ${BTSn_DESCRIPTION} + rf_locked 0 + nominal power ${BTSn_NOMINAL_POWER} + max_power_red ${BTSn_MAX_POWER_RED} + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config ${TCH_TYPE} + timeslot 3 + phys_chan_config ${TCH_TYPE} + timeslot 4 + phys_chan_config ${TCH_TYPE} + timeslot 5 + phys_chan_config ${TCH_TYPE} + timeslot 6 + phys_chan_config ${TCH_TYPE} + timeslot 7 + phys_chan_config PDCH +${foreach_end} + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level hodec info + logging level ho info + logging level nm info + logging level meas info + logging level lmi info + logging level linp notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +${foreach_end} diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg index 98f4e0c..51692fb 100644 --- a/net/templates/osmo-bsc.cfg +++ b/net/templates/osmo-bsc.cfg @@ -1,107 +1,16 @@ ${include(common_template_warning)} -stats interval 5 -! -stats reporter statsd - disable - remote-ip ${STATSD_IP} - remote-port 9125 - level global - no prefix - enable -! -line vty - no login -! +${include(common_osmo_bsc)} + e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive ipa bind ${BSC_IP} + cs7 instance 0 point-code ${BSC_PC} asp asp-clnt-bsc-0 2905 0 m3ua remote-ip ${STP_RAN_IP} -network - network country code ${MCC} - mobile network code ${MNC} - encryption a5 ${ENCR_A5} - neci 1 - paging any use tch 0 - handover 0 - periodic location update 12 - meas-feed destination 127.0.0.1 8888 - -${foreach(BTS)} - bts ${BTSn} - description ${BTSn_DESCRIPTION} - type osmo-bts - band ${BTS_BAND} - ip.access unit_id ${BTSn_IPA_UNIT} - location_area_code ${BTSn_LAC} - cell_identity ${BTSn_CI} - base_station_id_code ${BTSn_BSIC} - codec-support ${BTSn_CODEC_SUPPORT} - amr tch-f modes 3 - amr tch-f start-mode 3 - amr tch-h modes 3 - amr tch-h start-mode 3 - gprs mode ${BTSn_GPRS_MODE} - gprs nsvc 0 remote ip ${BTSn_GB_REMOTE_IP} - gprs nsvc 0 remote udp port ${BTSn_GB_REMOTE_PORT} - gprs nsvc 0 local udp port ${PCU_GB_LOCAL_PORT} - gprs nsvc 0 nsvci ${BTSn_NSVCI} - gprs nsei ${BTSn_NSEI} - gprs cell bvci ${BTSn_BVCI} - trx 0 - arfcn ${BTSn_ARFCN} - description ${BTSn_DESCRIPTION} - rf_locked 0 - nominal power ${BTSn_NOMINAL_POWER} - max_power_red ${BTSn_MAX_POWER_RED} - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config ${TCH_TYPE} - timeslot 3 - phys_chan_config ${TCH_TYPE} - timeslot 4 - phys_chan_config ${TCH_TYPE} - timeslot 5 - phys_chan_config ${TCH_TYPE} - timeslot 6 - phys_chan_config ${TCH_TYPE} - timeslot 7 - phys_chan_config PDCH -${foreach_end} msc 0 mgw remote-ip ${MGW4BSC_IP} mgw remote-port ${MGW4BSC_PORT} mgw endpoint-domain bsc - allow-emergency deny codec-list ${BSC_CODEC_LIST} - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k allowed - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden - -${foreach(LOG_OUTPUT)} -log ${LOG_OUTPUTn_TYPE} -${include(common_logging)} - logging level hodec info - logging level ho info - logging level nm info - logging level meas info - logging level lmi info - logging level linp notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice -${foreach_end} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Icb220657888b23ca19546cca78e10ae914f37751 Gerrit-Change-Number: 27436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: move bsc cfg/vars to bsc0

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27437 ) Change subject: net/templates: move bsc cfg/vars to bsc0 ...................................................................... net/templates: move bsc cfg/vars to bsc0 Prepare support for a second BSC, in order to test OsmoBSCNAT. * Rename BSC_* variables to BSC0_* * Rename MGW4BSC_* variables to MGW4BSC0_* * Rename osmo-bsc.cfg to osmo-bsc-0.cfg * Rename osmo-mgw-for-bsc.cfg to osmo-mgw-for-bsc-0.cfg Change-Id: Iaba2e3143b7bb6451a0104042e69d47ee5f48d3c --- M net/config_2g3g A net/templates/osmo-bsc-0.cfg M net/templates/osmo-bsc-nat.cfg D net/templates/osmo-bsc.cfg M net/templates/osmo-bts.cfg R net/templates/osmo-mgw-for-bsc-0.cfg M net/templates/run.sh 7 files changed, 33 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/27437/1 diff --git a/net/config_2g3g b/net/config_2g3g index e50d13c..0bd2b89 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -80,13 +80,13 @@ MGW4MSC_PORT="2427" MGW4MSC_VTY_IP="127.0.0.6" -MGW4BSC_IP="${TO_RAN_IP}" -MGW4BSC_PORT="2427" -MGW4BSC_VTY_IP="127.0.0.7" +MGW4BSC0_IP="${TO_RAN_IP}" +MGW4BSC0_PORT="2427" +MGW4BSC0_VTY_IP="127.0.0.7" -BSC_IP="${TO_RAN_IP}" -BSC_PC="0.23.3" -BSC_CODEC_LIST="hr3" +BSC0_IP="${TO_RAN_IP}" +BSC0_PC="0.23.3" +BSC0_CODEC_LIST="hr3" HNBGW_PC="0.3.0" HNBGW_IP="${TO_RAN_IP}" @@ -120,7 +120,7 @@ # STP_RAN_IP="127.0.0.2" # Enabled only when STP_CN_IP != STP_RAN_IP -BSCNAT_CN_PC="${BSC_PC}" +BSCNAT_CN_PC="${BSC0_PC}" BSCNAT_CN_IP="127.0.0.3" BSCNAT_RAN_PC="${MSC_PC}" BSCNAT_RAN_IP="127.0.0.4" diff --git a/net/templates/osmo-bsc-0.cfg b/net/templates/osmo-bsc-0.cfg new file mode 100644 index 0000000..8150307 --- /dev/null +++ b/net/templates/osmo-bsc-0.cfg @@ -0,0 +1,16 @@ +${include(common_template_warning)} +${include(common_osmo_bsc)} + +e1_input + ipa bind ${BSC0_IP} + +cs7 instance 0 + point-code ${BSC0_PC} + asp asp-clnt-bsc-0 2905 0 m3ua + remote-ip ${STP_RAN_IP} + +msc 0 + mgw remote-ip ${MGW4BSC0_IP} + mgw remote-port ${MGW4BSC0_PORT} + mgw endpoint-domain bsc0 + codec-list ${BSC0_CODEC_LIST} diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg index f049d7b..38ac647 100644 --- a/net/templates/osmo-bsc-nat.cfg +++ b/net/templates/osmo-bsc-nat.cfg @@ -16,7 +16,7 @@ local-ip ${BSCNAT_RAN_IP} sccp-address bsc routing-indicator PC - point-code ${BSC_PC} + point-code ${BSC0_PC} subsystem-number 254 bsc-nat diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg deleted file mode 100644 index 51692fb..0000000 --- a/net/templates/osmo-bsc.cfg +++ /dev/null @@ -1,16 +0,0 @@ -${include(common_template_warning)} -${include(common_osmo_bsc)} - -e1_input - ipa bind ${BSC_IP} - -cs7 instance 0 - point-code ${BSC_PC} - asp asp-clnt-bsc-0 2905 0 m3ua - remote-ip ${STP_RAN_IP} - -msc 0 - mgw remote-ip ${MGW4BSC_IP} - mgw remote-port ${MGW4BSC_PORT} - mgw endpoint-domain bsc - codec-list ${BSC_CODEC_LIST} diff --git a/net/templates/osmo-bts.cfg b/net/templates/osmo-bts.cfg index 6a1d02e..73bbed6 100644 --- a/net/templates/osmo-bts.cfg +++ b/net/templates/osmo-bts.cfg @@ -27,7 +27,7 @@ bts 0 band ${BTS_BAND} ipa unit-id ${BTS0_IPA_UNIT} - oml remote-ip ${BSC_IP} + oml remote-ip ${BSC0_IP} gsmtap-sapi ccch gsmtap-sapi pdtch trx 0 diff --git a/net/templates/osmo-mgw-for-bsc.cfg b/net/templates/osmo-mgw-for-bsc-0.cfg similarity index 72% rename from net/templates/osmo-mgw-for-bsc.cfg rename to net/templates/osmo-mgw-for-bsc-0.cfg index ba7e044..122bb35 100644 --- a/net/templates/osmo-mgw-for-bsc.cfg +++ b/net/templates/osmo-mgw-for-bsc-0.cfg @@ -1,12 +1,12 @@ ${include(common_template_warning)} mgcp - domain bsc - bind ip ${MGW4BSC_IP} - bind port ${MGW4BSC_PORT} + domain bsc0 + bind ip ${MGW4BSC0_IP} + bind port ${MGW4BSC0_PORT} rtp net-range 50004 60000 number endpoints 1024 line vty - bind ${MGW4BSC_VTY_IP} + bind ${MGW4BSC0_VTY_IP} ${foreach(LOG_OUTPUT)} log ${LOG_OUTPUTn_TYPE} diff --git a/net/templates/run.sh b/net/templates/run.sh index fdf4f3d..94cbce4 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -173,13 +173,13 @@ sgsn="osmo-sgsn" ggsn="osmo-ggsn" mgw4msc="osmo-mgw -c osmo-mgw-for-msc.cfg" -#mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc.cfg" -#mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg" -mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg" +#mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc-0.cfg" +#mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc-0.cfg" +mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc-0.cfg" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" stp4cn="osmo-stp -c osmo-stp-cn.cfg" stp4ran="osmo-stp -c osmo-stp-ran.cfg" -bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc-0.cfg" bscnat="osmo-bsc-nat" if [ "x${MSC_MNCC}" != "xinternal" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaba2e3143b7bb6451a0104042e69d47ee5f48d3c Gerrit-Change-Number: 27437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: support running a second bsc

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27438 ) Change subject: net/templates: support running a second bsc ...................................................................... net/templates: support running a second bsc New config variables: BSC_COUNT, BSC1_* Change-Id: If0fa5c5b4c76ae037d109211bbb27132689b4f80 --- M net/config_2g3g A net/templates/osmo-bsc-1.cfg A net/templates/osmo-mgw-for-bsc-1.cfg M net/templates/run.sh 4 files changed, 67 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/38/27438/1 diff --git a/net/config_2g3g b/net/config_2g3g index 0bd2b89..eb43e03 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -84,10 +84,21 @@ MGW4BSC0_PORT="2427" MGW4BSC0_VTY_IP="127.0.0.7" +MGW4BSC1_IP="127.0.0.11" +MGW4BSC1_PORT="2427" +MGW4BSC1_VTY_IP="127.0.0.11" + +BSC_COUNT=1 + BSC0_IP="${TO_RAN_IP}" BSC0_PC="0.23.3" BSC0_CODEC_LIST="hr3" +# Enabled only when BSC_COUNT=2 +BSC1_IP="127.0.0.10" +BSC1_PC="0.23.4" +BSC1_CODEC_LIST="hr3" + HNBGW_PC="0.3.0" HNBGW_IP="${TO_RAN_IP}" diff --git a/net/templates/osmo-bsc-1.cfg b/net/templates/osmo-bsc-1.cfg new file mode 100644 index 0000000..5f4a7a3 --- /dev/null +++ b/net/templates/osmo-bsc-1.cfg @@ -0,0 +1,22 @@ +${include(common_template_warning)} +${include(common_osmo_bsc)} + +e1_input + ipa bind ${BSC1_IP} + +cs7 instance 0 + point-code ${BSC1_PC} + asp asp-clnt-bsc-1 2905 0 m3ua + remote-ip ${STP_RAN_IP} + +msc 0 + mgw remote-ip ${MGW4BSC1_IP} + mgw remote-port ${MGW4BSC1_PORT} + mgw endpoint-domain bsc1 + codec-list ${BSC1_CODEC_LIST} + +ctrl + bind ${BSC1_IP} + +line vty + bind ${BSC1_IP} diff --git a/net/templates/osmo-mgw-for-bsc-1.cfg b/net/templates/osmo-mgw-for-bsc-1.cfg new file mode 100644 index 0000000..563b759 --- /dev/null +++ b/net/templates/osmo-mgw-for-bsc-1.cfg @@ -0,0 +1,16 @@ +${include(common_template_warning)} +mgcp + domain bsc1 + bind ip ${MGW4BSC1_IP} + bind port ${MGW4BSC1_PORT} + rtp net-range 50004 60000 + number endpoints 1024 +line vty + bind ${MGW4BSC1_VTY_IP} + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level rtp info + logging level lmgcp info +${foreach_end} diff --git a/net/templates/run.sh b/net/templates/run.sh index 94cbce4..3430966 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -173,13 +173,13 @@ sgsn="osmo-sgsn" ggsn="osmo-ggsn" mgw4msc="osmo-mgw -c osmo-mgw-for-msc.cfg" -#mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc-0.cfg" -#mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc-0.cfg" -mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc-0.cfg" +#mgw4bsc="gdb -ex run --args osmo-mgw" +#mgw4bsc="strace osmo-mgw" +mgw4bsc="osmo-mgw" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" stp4cn="osmo-stp -c osmo-stp-cn.cfg" stp4ran="osmo-stp -c osmo-stp-ran.cfg" -bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc-0.cfg" +bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" if [ "x${MSC_MNCC}" != "xinternal" ]; then @@ -251,16 +251,26 @@ term "$mgw4msc" MGW4MSC sleep .2 -term "$mgw4bsc" MGW4BSC - -sleep .2 term "$msc" MSC sleep 2 term "$hnbgw" HNBGW sleep .2 -term "$bsc" BSC + +if [ "$BSC_COUNT" = 1 ]; then + term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC + sleep .2 + term "$bsc -c osmo-bsc-0.cfg" BSC +else + term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 + sleep .2 + term "$mgw4bsc -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 + sleep .2 + term "$bsc -c osmo-bsc-0.cfg" BSC0 + sleep .2 + term "$bsc -c osmo-bsc-1.cfg" BSC1 +fi if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If0fa5c5b4c76ae037d109211bbb27132689b4f80 Gerrit-Change-Number: 27438 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/fill_config.py: refactor print 'using config...'

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27433 ) Change subject: net/fill_config.py: refactor print 'using config...' ...................................................................... net/fill_config.py: refactor print 'using config...' Put each line in a separate, aligned print statement and use f-strings (Python 3.6 feature, even debian oldstable has > 3.6 by now). This is in preparation to add a new line about the original config in the next patch. Change-Id: Iad39a7889c107ceb8c16325bb545cb426eb9b6e2 --- M net/fill_config.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/27433/1 diff --git a/net/fill_config.py b/net/fill_config.py index d68f50c..f68f572 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -52,7 +52,9 @@ tmpl_dir = os.path.realpath(tmpl_dir) net_dir = os.path.realpath(".") -print('using config file %r\non templates %r\nwith NET_DIR %r' % (local_config_file, tmpl_dir, net_dir)) +print(f'using config file: {local_config_file}') +print(f'on templates: {tmpl_dir}') +print(f'with NET_DIR: {net_dir}') with open(LAST_LOCAL_CONFIG_FILE, 'w') as last_file: last_file.write(local_config_file) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iad39a7889c107ceb8c16325bb545cb426eb9b6e2 Gerrit-Change-Number: 27433 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022