diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-10-26 00:33:26 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-10-26 00:50:00 +0200 |
commit | cb1838d8075379fdc08095fdd718b459180a38ae (patch) | |
tree | 730f22af482b70f4209c2be57e1e084d06ffce01 /openbsc | |
parent | ed03661871ac8ee1715c04390d25631537b084ac (diff) |
rename osmo-bsc to osmo-bsc-sccplite
This is to avoid naming conflicts with the new osmo-bsc, which resides
in its own git repository (osmo-bsc.git) and which uses libosmo-sigtran
and implements (primarily) 3GPP AoIP.
Change-Id: If10d1599b62d010726336134091a4e855c380d93
Diffstat (limited to 'openbsc')
-rw-r--r-- | openbsc/.gitignore | 2 | ||||
-rwxr-xr-x | openbsc/contrib/bsc-test/msc.sh | 4 | ||||
-rw-r--r-- | openbsc/contrib/systemd/osmo-bsc-sccplite.service (renamed from openbsc/contrib/systemd/osmo-bsc.service) | 2 | ||||
-rw-r--r-- | openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg (renamed from openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg) | 0 | ||||
-rw-r--r-- | openbsc/osmoappdesc.py | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/Makefile.am | 6 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
-rw-r--r-- | openbsc/tests/ctrl_test_runner.py | 8 | ||||
-rw-r--r-- | openbsc/tests/vty_test_runner.py | 8 |
9 files changed, 18 insertions, 18 deletions
diff --git a/openbsc/.gitignore b/openbsc/.gitignore index f54aa5925..3a811e7ee 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -9,7 +9,7 @@ bscconfig.h.in openbsc.pc src/osmo-nitb/osmo-nitb src/osmo-bsc_mgcp/osmo-bsc_mgcp -src/osmo-bsc/osmo-bsc +src/osmo-bsc/osmo-bsc-sccplite src/utils/meas_vis src/utils/meas_json src/utils/osmo-meas-pcap2db diff --git a/openbsc/contrib/bsc-test/msc.sh b/openbsc/contrib/bsc-test/msc.sh index bec011d4c..766603def 100755 --- a/openbsc/contrib/bsc-test/msc.sh +++ b/openbsc/contrib/bsc-test/msc.sh @@ -2,7 +2,7 @@ while true; do - echo "Kill the osmo-bsc" - /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc` + echo "Kill the osmo-bsc-sccplite" + /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc-sccplite` sleep 58s done diff --git a/openbsc/contrib/systemd/osmo-bsc.service b/openbsc/contrib/systemd/osmo-bsc-sccplite.service index 4047fef48..70cda5f63 100644 --- a/openbsc/contrib/systemd/osmo-bsc.service +++ b/openbsc/contrib/systemd/osmo-bsc-sccplite.service @@ -5,7 +5,7 @@ Wants=osmo-bsc-mgcp.service [Service] Type=simple Restart=always -ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s +ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s RestartSec=2 [Install] diff --git a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg b/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg index ab23a76bc..ab23a76bc 100644 --- a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index ba6d954ae..c5b20aca3 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -28,7 +28,7 @@ nitb_e1_configs = [ app_configs = { - "osmo-bsc": ["doc/examples/osmo-bsc/osmo-bsc.cfg"], + "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"], "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"], "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"], "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", @@ -36,7 +36,7 @@ app_configs = { } -apps = [(4242, "src/osmo-bsc/osmo-bsc", "OsmoBSC", "osmo-bsc"), +apps = [(4242, "src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "osmo-bsc-sccplite"), (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat"), (4243, "src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp"), (4242, "src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb"), diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am index ae9410c9d..343af702c 100644 --- a/openbsc/src/osmo-bsc/Makefile.am +++ b/openbsc/src/osmo-bsc/Makefile.am @@ -21,10 +21,10 @@ AM_LDFLAGS = \ $(NULL) bin_PROGRAMS = \ - osmo-bsc \ + osmo-bsc-sccplite \ $(NULL) -osmo_bsc_SOURCES = \ +osmo_bsc_sccplite_SOURCES = \ osmo_bsc_main.c \ osmo_bsc_vty.c \ osmo_bsc_api.c \ @@ -38,7 +38,7 @@ osmo_bsc_SOURCES = \ $(NULL) # once again since TRAU uses CC symbol :( -osmo_bsc_LDADD = \ +osmo_bsc_sccplite_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 6081460c9..022cd3dac 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -70,7 +70,7 @@ struct llist_head *bsc_access_lists(void) static void print_usage() { - printf("Usage: osmo-bsc\n"); + printf("Usage: osmo-bsc-sccplite\n"); } static void print_help() diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index 46c4dcf01..fb6902705 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -155,11 +155,11 @@ class TestCtrlBSC(TestCtrlBase): os.unlink("tmp_dummy_sock") def ctrl_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-r", "tmp_dummy_sock", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-r", "tmp_dummy_sock", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def ctrl_app(self): - return (4249, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4249, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testCtrlErrs(self): r = self.do_get('invalid') @@ -606,7 +606,7 @@ class TestCtrlNAT(TestCtrlBase): # added. e.g. by implementing a get for the list. def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlBSC) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 8bec7c0a6..a3161fba1 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -579,11 +579,11 @@ class TestVTYNITB(TestVTYGenericBSC): class TestVTYBSC(TestVTYGenericBSC): def vty_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def vty_app(self): - return (4242, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4242, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testConfigNetworkTree(self): self._testConfigNetworkTree() @@ -1113,7 +1113,7 @@ def nat_bsc_sock_test(nr, tk, verbose = False, proc=None): return bsc def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestVTYBSC) |