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

Change in osmo-dev[master]: make: add support for "virtphy" from osmocom-bb

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27447 ) Change subject: make: add support for "virtphy" from osmocom-bb ...................................................................... make: add support for "virtphy" from osmocom-bb Change-Id: Id4e7a9d948332c03d56e2637badeef78c78e5aa7 --- M all.deps M gen_makefile.py 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index 85b8d34..75c2b96 100644 --- a/all.deps +++ b/all.deps @@ -34,3 +34,4 @@ # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore +osmocom-bb_virtphy libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index d574565..a87a289 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -163,6 +163,14 @@ touch $@ ''' + if proj == "osmocom-bb_virtphy": + return f''' +.make.{proj}.clone: .make.osmocom-bb.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s osmocom-bb/src/host/virt_phy {src_proj} + touch $@ + ''' + return f''' .make.{proj}.clone: @echo -e "\\n\\n\\n===== $@\\n" @@ -354,6 +362,9 @@ .PHONY: mobile mobile: osmocom-bb_layer23 +.PHONY: virtphy +virtphy: osmocom-bb_virtphy + # # Other convenience targets # -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id4e7a9d948332c03d56e2637badeef78c78e5aa7 Gerrit-Change-Number: 27447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27448 ) Change subject: net/templates: support running MS ...................................................................... net/templates: support running MS New config variables: * MS_RUN_IN_OSMO_DEV * MS_SUBSCR_ID * MS_IMSI * MS_KI * MS_MSISDN Change-Id: I377ca41d18ee6b057559cadb0f0bb44f85643eb6 --- M net/config_2g3g A net/templates/hlr_db_add_ms.sql A net/templates/mobile.cfg M net/templates/run.sh 4 files changed, 85 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/config_2g3g b/net/config_2g3g index bc0ced3..2149c39 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -142,6 +142,13 @@ BSCNAT_RAN_PC="${MSC_PC}" BSCNAT_RAN_IP="127.0.0.4" +# Set to 1 to have osmo-dev run mobile and virtphy from osmocom-bb +MS_RUN_IN_OSMO_DEV=0 +MS_SUBSCR_ID="1337" +MS_IMSI="001010000000000" +MS_KI="00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" +MS_MSISDN="555" + # PBX_SERVER: # "kamailio" -- launch kamailio # "freeswitch" -- launch freeswitch diff --git a/net/templates/hlr_db_add_ms.sql b/net/templates/hlr_db_add_ms.sql new file mode 100644 index 0000000..54fda4b --- /dev/null +++ b/net/templates/hlr_db_add_ms.sql @@ -0,0 +1,10 @@ +/* Use this file to add the subscriber for MS_RUN_IN_OSMO_DEV=1 to your hlr.db: + * sqlite3 -batch hlr.db < hlr_db_add_ms.sql + */ + +INSERT INTO subscriber (id, imsi, msisdn) +VALUES (${MS_SUBSCR_ID}, "${MS_IMSI}", "${MS_MSISDN}"); + +INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) +VALUES (${MS_SUBSCR_ID}, 1 /* OSMO_AUTH_ALG_COMP128v1 */, + REPLACE("${MS_KI}", " ", "")); diff --git a/net/templates/mobile.cfg b/net/templates/mobile.cfg new file mode 100644 index 0000000..a9fcb3f --- /dev/null +++ b/net/templates/mobile.cfg @@ -0,0 +1,62 @@ +${include(common_template_warning)} +line vty + no login + +no gps enable + +no hide-default + +ms 1 + layer2-socket /tmp/osmocom_l2 + sap-socket /tmp/osmocom_sap + sim test + network-selection-mode auto + imei 000000000000000 0 + imei-fixed + no emergency-imsi + no sms-service-center + no call-waiting + auto-answer + no force-rekey + no clip + no clir + tx-power auto + no simulated-delay + no stick + location-updating + neighbour-measurement + codec full-speed prefer + no abbrev + support + sms + a5/1 + a5/2 + p-gsm + e-gsm + r-gsm + no gsm-850 + dcs + no pcs + class-900 4 + class-850 4 + class-dcs 1 + class-pcs 1 + channel-capability sdcch+tchf+tchh + full-speech-v1 + full-speech-v2 + min-rxlev -106 + dsc-max 90 + no skip-max-per-band + test-sim + imsi ${MS_IMSI} + ki comp128 ${MS_KI} + no barred-access + rplmn ${MCC} ${MNC} + audio + io-handler loopback + no shutdown + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} +${foreach_end} diff --git a/net/templates/run.sh b/net/templates/run.sh index cda7fc0..e1cf226 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -183,6 +183,8 @@ bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" bts="osmo-bts-virtual" +virtphy="virtphy" +ms="mobile -c mobile.cfg" if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" @@ -258,6 +260,10 @@ fi ${foreach_end} +if [ "${MS_RUN_IN_OSMO_DEV}" = 1 ]; then + term "$virtphy" VIRTPHY + term "$ms" MS +fi if [ "x${MSC_MNCC}" != "xinternal" ]; then term "$sipcon" SIPCON -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I377ca41d18ee6b057559cadb0f0bb44f85643eb6 Gerrit-Change-Number: 27448 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: gen_makefile.py: mark convenience targets as phony

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27444 ) Change subject: gen_makefile.py: mark convenience targets as phony ...................................................................... gen_makefile.py: mark convenience targets as phony Change-Id: Idd7e485e17b178f1bf6feef5d30db57e6467267e --- M gen_makefile.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/gen_makefile.py b/gen_makefile.py index 9eb2d94..03523df 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -305,6 +305,7 @@ out.write(r''' default: usrp +.PHONY: cn cn: \ osmo-ggsn \ osmo-hlr \ @@ -316,11 +317,13 @@ osmo-smlc \ $(NULL) +.PHONY: cn-bsc cn-bsc: \ cn \ osmo-bsc \ $(NULL) +.PHONY: usrp usrp: \ cn-bsc \ osmo-bts \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Idd7e485e17b178f1bf6feef5d30db57e6467267e Gerrit-Change-Number: 27444 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: make: add support for "mobile" from osmocom-bb

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27446 ) Change subject: make: add support for "mobile" from osmocom-bb ...................................................................... make: add support for "mobile" from osmocom-bb Allow building and installing the "mobile" application from osmocom-bb.git's src/host/layer23 dir. Change-Id: Ic75cca703e317eaee593b4d6c78784309c056f17 --- M all.deps M gen_makefile.py 2 files changed, 43 insertions(+), 12 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index 20972a8..85b8d34 100644 --- a/all.deps +++ b/all.deps @@ -30,3 +30,7 @@ # can only clone these docker-playground osmo-ttcn3-hacks +osmocom-bb + +# configure.ac not in topdir of repository +osmocom-bb_layer23 libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index 2e9cc24..d574565 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -154,16 +154,35 @@ return {} return dict(read_projects_deps(path)) +def gen_makefile_clone(proj, src, src_proj, url, push_url): + if proj == "osmocom-bb_layer23": + return f''' +.make.{proj}.clone: .make.osmocom-bb.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s osmocom-bb/src/host/layer23 {src_proj} + touch $@ + ''' + + return f''' +.make.{proj}.clone: + @echo -e "\\n\\n\\n===== $@\\n" + test -d {src} || mkdir -p {src} + test -d {src_proj} || ( git -C {src} clone "{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin "{push_url}/{proj}" ) + sync + touch $@ + ''' + def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) if proj == 'openbsc': src_proj = os.path.join(src_proj, 'openbsc') build_proj = os.path.join(build_dir, proj) - make_to_src = os.path.relpath(src_dir, make_dir) - make_to_src_proj = os.path.relpath(src_proj, make_dir) + src = os.path.relpath(src_dir, make_dir) + src_proj = os.path.relpath(src_proj, make_dir) make_to_build_proj = os.path.relpath(build_proj, make_dir) build_to_src = os.path.relpath(src_proj, build_proj) + push_url = push_url or url if configure_opts: configure_opts_str = ' '.join(configure_opts) @@ -188,12 +207,7 @@ \) \ -and -not -name "config.h" 2>/dev/null) -.make.{proj}.clone: - @echo -e "\n\n\n===== $@\n" - test -d {src} || mkdir -p {src} - test -d {src_proj} || ( git -C {src} clone "{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin "{push_url}/{proj}" ) - sync - touch $@ +{clone_rule} .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac if {distclean_cond}; then $(MAKE) {proj}-distclean; fi @@ -248,13 +262,14 @@ '''.format( url=url, - push_url=push_url or url, + push_url=push_url, proj=proj, jobs=jobs, - src=make_to_src, - src_proj=make_to_src_proj, + src=src, + src_proj=src_proj, build_proj=make_to_build_proj, build_to_src=build_to_src, + clone_rule=gen_makefile_clone(proj, src, src_proj, url, push_url), deps_installed=' '.join(['.make.%s.install' % d for d in deps]), deps_reinstall=' '.join(['%s-reinstall' %d for d in deps]), configure_opts=configure_opts_str, @@ -264,7 +279,7 @@ check='check' if make_check else '', docker_cmd=f'{args.docker_cmd} ' if args.docker_cmd else '', cflags='CFLAGS=-g ' if args.build_debug else '', - distclean_cond=f'[ -e {make_to_src_proj}/config.status ]' if args.auto_distclean else 'false' + distclean_cond=f'[ -e {src_proj}/config.status ]' if args.auto_distclean else 'false' ) @@ -305,6 +320,9 @@ out.write(r''' default: usrp +# +# Convenience targets for whole networks +# .PHONY: cn cn: \ osmo-ggsn \ @@ -330,6 +348,15 @@ osmo-trx \ $(NULL) +# +# Convenience targets for components in subdirs of repositories +# +.PHONY: mobile +mobile: osmocom-bb_layer23 + +# +# Other convenience targets +# .PHONY: all_debug all_debug: $(MAKE) --dry-run -d all | grep "is newer than target" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic75cca703e317eaee593b4d6c78784309c056f17 Gerrit-Change-Number: 27446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022