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

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-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 a second bsc

by osmith

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

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/README: update tmux documentation

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27435 ) Change subject: net/README: update tmux documentation ...................................................................... net/README: update tmux documentation Change-Id: I5561dae3898bf86176d7693c08732a68a1158a14 --- M net/README 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/README b/net/README index f3c388a..696a803 100644 --- a/net/README +++ b/net/README @@ -123,11 +123,12 @@ When you launch run.sh, many xterms are launched, and when hitting enter, all of them get destroyed again. This is obviously intended to be run on your -desktop computer or laptop, not on a remote box. It may also make sense to -launch all of them in the current shell, and maybe or maybe not switch off -stderr logging; or to launch each component in a tmux window or whatnot -- if -you figure out something in that line, I would be glad to get contributions and -incorporate that. +desktop computer or laptop, not on a remote box. + +It's also possible to set TERMINAL="tmux" in your network configuration, then +run.sh starts a tmux session and runs each Osmocom program as own tmux window +inside that session. Switch to the first window (^B + 0) and hit enter to close +all windows and the whole tmux session. This does work over SSH. === Logging and pcaps -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I5561dae3898bf86176d7693c08732a68a1158a14 Gerrit-Change-Number: 27435 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: get missing config variables from config_2g3g

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27434 ) Change subject: net: get missing config variables from config_2g3g ...................................................................... net: get missing config variables from config_2g3g Don't ask the user to copy config_2g3g and manually keep it in sync with config_2g3g with each change anymore. Instead, let the user config be a diff on top of config_2g3g. This is in preparation to adding new variables for use with OsmoBSCNAT. Change-Id: I5870d39aee8be84c2024f8a2a71ee4a734a4fc7c --- M net/README M net/fill_config.py 2 files changed, 93 insertions(+), 38 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/README b/net/README index 73a8d2f..f3c388a 100644 --- a/net/README +++ b/net/README @@ -10,28 +10,55 @@ === Quick Start -cp config_2g3g config_mine -$EDITOR config_mine -# update IP addresses and device names as required +* Open config_2g3g in a text editor (original config) +* Open a new file in a text editor (your config) +* Copy over all lines you want to change in your config and edit them there +* Your resulting minimal config could look like this: -mkdir my_network -cd my_network -../fill_config.py ../config_mine ../templates + TERMINAL="tmux" -./run.sh -# Launches numerous x-terminals with one component running in each. -# Logs and pcap traces are being taken automatically. + ETH_DEV=enp0s25 -# hit enter in the original first terminal to tear down all programs. -# Enter a name to save logs, otherwise all logging will be stored -# under autolog/<timestamp> + TO_RAN_IP="192.168.1.123" + TO_RAN_IU_IP="192.168.1.42" -Then possibly modify the config and refresh: + MCC=999 + MNC=99 -# tweak config? -$EDITOR ../config_mine -../fill_config.py -# picks up same ../config_mine and ../templates from last time + BTS0_IPA_UNIT="1234 0" + BTS0_ARFCN=800 + +* Create a network directory and generate configs: + + $ mkdir my_network + $ cd my_network + $ ../fill_config.py ../config_mine ../templates + +* Run the network: + + $ ./run.sh + + This launches numerous terminals with one component running in each. + Logs and pcap traces are being taken automatically. + +* Tear down: + + Hit enter in the original first terminal to tear down all programs. + Enter a name to save logs, otherwise all logging will be stored + under autolog/<timestamp>. + +* Regenerate configs: + + Modify your config and regenerate the network configs as follows, the same + original config, your config and templates will be used as last time. + + $ $EDITOR ../config_mine + $ ../fill_config.py + + ('make regen' also works) + + +=== Advanced usage / more examples # own templates? cp -r ../templates ../templates_mine @@ -67,7 +94,7 @@ fill_config.py script. See e.g. templates/. A *file* contains local config items as name=val pairs that are put into the -templates. See e.g. config_2g3g. +templates. It is usually a subset of config_2g3g. The fill_config.py script helps to fill the templates with the config values. Simply invoke fill_config.py with a dir argument (templates dir) and a file argument (specific @@ -77,6 +104,11 @@ If one or both are omitted, the script tries to re-use the most recent paths, they were stored in local files '.last_config' and '.last_templates'. +The -o parameter of fill_config.py can be used to supply a different original +config file than config_2g3g. If it is omitted, the path is read from a +'.last_config_orig' file inside the network directory if present, and config_2g3g +is used otherwise. + The result is a complete set of .cfg files that match your local machine and network config. diff --git a/net/fill_config.py b/net/fill_config.py index f68f572..8d1b959 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -8,7 +8,9 @@ def file_newer(path_a, than_path_b): return os.path.getmtime(path_a) > os.path.getmtime(than_path_b) +DEFAULT_ORIG_CONFIG = os.path.normpath(os.path.realpath(__file__) + "/../config_2g3g") LAST_LOCAL_CONFIG_FILE = '.last_config' +LAST_ORIG_CONFIG_FILE = '.last_config_orig' LAST_TMPL_DIR = '.last_templates' parser = argparse.ArgumentParser(description=__doc__, @@ -18,10 +20,14 @@ parser.add_argument('-s', '--check-stale', dest='check_stale', action='store_true', help='only verify age of generated files vs. config and templates.' ' Exit nonzero when any source file is newer. Do not write anything.') +parser.add_argument('-o', '--original-config', + help='get missing variables from this file, default is config_2g3g' + ' or the file used previously to fill an existing template dir') args = parser.parse_args() local_config_file = None +orig_config_file = args.original_config tmpl_dir = None for src in args.sources: @@ -37,6 +43,12 @@ if local_config_file is None and os.path.isfile(LAST_LOCAL_CONFIG_FILE): local_config_file = open(LAST_LOCAL_CONFIG_FILE).read().strip() +if orig_config_file is None: + if os.path.isfile(LAST_ORIG_CONFIG_FILE): + orig_config_file = open(LAST_ORIG_CONFIG_FILE).read().strip() + else: + orig_config_file = DEFAULT_ORIG_CONFIG + if tmpl_dir is None and os.path.isfile(LAST_TMPL_DIR): tmpl_dir = open(LAST_TMPL_DIR).read().strip() @@ -48,47 +60,57 @@ print("No such config file: %r" % local_config_file) exit(1) +if not os.path.isfile(orig_config_file): + print("No such config file: %r" % orig_config_file) + exit(1) + local_config_file = os.path.realpath(local_config_file) tmpl_dir = os.path.realpath(tmpl_dir) net_dir = os.path.realpath(".") print(f'using config file: {local_config_file}') +print(f'with original: {orig_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) +with open(LAST_ORIG_CONFIG_FILE, 'w') as last_file: + last_file.write(orig_config_file) with open(LAST_TMPL_DIR, 'w') as last_file: last_file.write(tmpl_dir) -# read in variable values from config file +# read in variable values from config files # NET_DIR is the folder where fill_config.py was started local_config = {"NET_DIR": net_dir} -line_nr = 0 -for line in open(local_config_file): - line_nr += 1 - line = line.strip('\n') +for config_file in [orig_config_file, local_config_file]: + current_config_identifiers = ["NET_DIR"] + line_nr = 0 + for line in open(config_file): + line_nr += 1 + line = line.strip('\n') - if line.startswith('#'): - continue + if line.startswith('#'): + continue - if not '=' in line: - if line: - print("Error: %r line %d: %r" % (local_config_file, line_nr, line)) - exit(1) - continue + if not '=' in line: + if line: + print("Error: %r line %d: %r" % (config_file, line_nr, line)) + exit(1) + continue - split_pos = line.find('=') - name = line[:split_pos] - val = line[split_pos + 1:] + split_pos = line.find('=') + name = line[:split_pos] + val = line[split_pos + 1:] - if val.startswith('"') and val.endswith('"'): - val = val[1:-1] + if val.startswith('"') and val.endswith('"'): + val = val[1:-1] - if name in local_config: - print("Error: duplicate identifier in %r line %d: %r" % (local_config_file, line_nr, line)) - local_config[name] = val + if name in current_config_identifiers: + print("Error: duplicate identifier in %r line %d: %r" % (config_file, line_nr, line)) + local_config[name] = val + current_config_identifiers += [name] # replace variable names with above values recursively replace_re = re.compile('\$\{([A-Z_][A-Za-z0-9_]*)\}') @@ -240,6 +262,7 @@ if args.check_stale: check_stale(local_config_file, dst) + check_stale(orig_config_file, dst) check_stale(tmpl_src, dst) local_config['_fname'] = tmpl_name -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I5870d39aee8be84c2024f8a2a71ee4a734a4fc7c Gerrit-Change-Number: 27434 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-bsc.cfg part

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-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: drop 'fg'

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27432 ) Change subject: net/templates/run.sh: drop 'fg' ...................................................................... net/templates/run.sh: drop 'fg' This was related to attempting to fix the infinite "q Enter to close" msgs bug, which has been properly fixed in Iebb799493f76fd57f24b15c998ded2bd8e284e6b. Remove fg to get rid of this error: zsh:fg:1: no job control in this shell. Change-Id: Iba7a1adbc4f48b0477a53590ffec8af518fdf467 --- M net/templates/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 0a8cfb1..fdf4f3d 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -128,7 +128,7 @@ case "$terminal" in tmux) - tmux new-window -d -n "$title" "$launcher &; echo \$! > $pidfile_term; fg; wait" + tmux new-window -d -n "$title" "$launcher &; echo \$! > $pidfile_term; wait" ;; *) $terminal \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba7a1adbc4f48b0477a53590ffec8af518fdf467 Gerrit-Change-Number: 27432 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(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/fill_config.py: refactor print 'using config...'

by osmith

osmith has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, approved; Verified 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-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-bsc-nat.cfg: omit PC for bsc

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27460 ) Change subject: net/templates/osmo-bsc-nat.cfg: omit PC for bsc ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I78ef36c72ff9a7b801e922eccc89dc44fbba7f23 Gerrit-Change-Number: 27460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Mar 2022 08:02:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: change prefix from CN to NET

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27459 ) Change subject: net/templates/run.sh: change prefix from CN to NET ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3f46d5a4c7bd20861735c4e01f7cafbc5db08aae Gerrit-Change-Number: 27459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Mar 2022 08:01:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: move cmds for network components to config

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27458 ) Change subject: net: move cmds for network components to config ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ifce731ab61d263e9df7a8dc87dd572ca3d30f8dd Gerrit-Change-Number: 27458 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Mar 2022 08:01:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022