<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10926">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install sample cfg file to /etc/osmocom<br><br>Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34<br>---<br>M debian/osmo-bsc-mgcp.install<br>M debian/osmocom-bsc-nat.install<br>M debian/osmocom-bsc-sccplite.install<br>M debian/osmocom-nitb.install<br>M openbsc/doc/examples/Makefile.am<br>R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg<br>R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg<br>R openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg<br>R openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg<br>R openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg<br>R openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg<br>M openbsc/osmoappdesc.py<br>M openbsc/tests/ctrl_test_runner.py<br>M openbsc/tests/smpp_test_runner.py<br>M openbsc/tests/vty_test_runner.py<br>15 files changed, 34 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install</span><br><span>index 828fb31..8f9b74f 100644</span><br><span>--- a/debian/osmo-bsc-mgcp.install</span><br><span>+++ b/debian/osmo-bsc-mgcp.install</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-bsc-mgcp.cfg</span><br><span> lib/systemd/system/osmo-bsc-mgcp.service</span><br><span> usr/bin/osmo-bsc_mgcp</span><br><span>diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install</span><br><span>index d6cabe2..ba134d1 100644</span><br><span>--- a/debian/osmocom-bsc-nat.install</span><br><span>+++ b/debian/osmocom-bsc-nat.install</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/etc/osmocom/osmo-bsc-nat.cfg</span><br><span> /lib/systemd/system/osmo-bsc-nat.service</span><br><span> /usr/bin/osmo-bsc_nat</span><br><span>diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install</span><br><span>index 67c50cb..872333e 100644</span><br><span>--- a/debian/osmocom-bsc-sccplite.install</span><br><span>+++ b/debian/osmocom-bsc-sccplite.install</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/etc/osmocom/osmo-bsc-sccplite.cfg</span><br><span> /lib/systemd/system/osmo-bsc-sccplite.service</span><br><span> /usr/bin/osmo-bsc-sccplite</span><br><span>diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install</span><br><span>index 78e8f77..87ed7e2 100644</span><br><span>--- a/debian/osmocom-nitb.install</span><br><span>+++ b/debian/osmocom-nitb.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/etc/osmocom/osmo-nitb.cfg</span><br><span> /lib/systemd/system/osmo-nitb.service</span><br><span> /usr/bin/osmo-nitb</span><br><span> openbsc/contrib/*.py usr/bin/</span><br><span>diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am</span><br><span>index 530c3fa..2b8336f 100644</span><br><span>--- a/openbsc/doc/examples/Makefile.am</span><br><span>+++ b/openbsc/doc/examples/Makefile.am</span><br><span>@@ -1,3 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-nitb/sysmobts/osmo-nitb.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bsc_mgcp/osmo-bsc-mgcp.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_NAT</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += osmo-bsc_nat/osmo-bsc-nat.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_BSC</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += osmo-bsc-sccplite/osmo-bsc-sccplite.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconfdir = $(sysconfdir)/osmocom</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconf_DATA = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'</span><br><span> </span><br><span> dist-hook:</span><br><span>diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg</span><br><span>rename to openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg</span><br><span>diff --git a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg</span><br><span>rename to openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg</span><br><span>diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg</span><br><span>rename to openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg</span><br><span>diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg</span><br><span>rename to openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg</span><br><span>diff --git a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg</span><br><span>rename to openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg</span><br><span>diff --git a/openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg</span><br><span>similarity index 100%</span><br><span>rename from openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg</span><br><span>rename to openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg</span><br><span>diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py</span><br><span>index c5b20ac..5b01e4c 100644</span><br><span>--- a/openbsc/osmoappdesc.py</span><br><span>+++ b/openbsc/osmoappdesc.py</span><br><span>@@ -20,19 +20,19 @@</span><br><span> "doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg",</span><br><span> "doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg",</span><br><span> "doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/bs11/openbsc.cfg",</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/bs11/osmo-nitb.cfg",</span><br><span> "doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg",</span><br><span> "doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/rbs2308/openbsc.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg"</span><br><span> ]</span><br><span> </span><br><span> </span><br><span> app_configs = {</span><br><span> "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"],</span><br><span style="color: hsl(0, 100%, 40%);">- "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"],</span><br><span style="color: hsl(0, 100%, 40%);">- "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"],</span><br><span style="color: hsl(120, 100%, 40%);">+ "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"],</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgcp": ["doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"],</span><br><span> "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"],</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"],</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -43,6 +43,6 @@</span><br><span> ]</span><br><span> </span><br><span> vty_command = ["./src/osmo-nitb/osmo-nitb", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]</span><br><span> </span><br><span> vty_app = apps[3] # reference apps[] entry for osmo-nitb</span><br><span>diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py</span><br><span>index cf83fad..d76ed65 100644</span><br><span>--- a/openbsc/tests/ctrl_test_runner.py</span><br><span>+++ b/openbsc/tests/ctrl_test_runner.py</span><br><span>@@ -468,7 +468,7 @@</span><br><span> </span><br><span> def ctrl_command(self):</span><br><span> return ["./src/osmo-nitb/osmo-nitb", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/nanobts/openbsc.cfg", "-l", "test_hlr.sqlite3"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg", "-l", "test_hlr.sqlite3"]</span><br><span> </span><br><span> def ctrl_app(self):</span><br><span> return (4249, "./src/osmo-nitb/osmo-nitb", "OsmoBSC", "nitb")</span><br><span>@@ -577,7 +577,7 @@</span><br><span> </span><br><span> def ctrl_command(self):</span><br><span> return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"]</span><br><span> </span><br><span> def ctrl_app(self):</span><br><span> return (4250, "./src/osmo-bsc_nat/osmo-bsc_nat", "OsmoNAT", "nat")</span><br><span>diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py</span><br><span>index 2fd144b..58645aa 100644</span><br><span>--- a/openbsc/tests/smpp_test_runner.py</span><br><span>+++ b/openbsc/tests/smpp_test_runner.py</span><br><span>@@ -64,7 +64,7 @@</span><br><span> </span><br><span> def vty_command(self):</span><br><span> return ["./src/osmo-nitb/osmo-nitb", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span> return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb")</span><br><span>diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py</span><br><span>index a3161fb..5afcd2e 100644</span><br><span>--- a/openbsc/tests/vty_test_runner.py</span><br><span>+++ b/openbsc/tests/vty_test_runner.py</span><br><span>@@ -66,7 +66,7 @@</span><br><span> class TestVTYMGCP(TestVTYBase):</span><br><span> def vty_command(self):</span><br><span> return ["./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-bsc_mgcp/mgcp.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span> return (4243, "./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp")</span><br><span>@@ -170,7 +170,7 @@</span><br><span> </span><br><span> def vty_command(self):</span><br><span> return ["./src/osmo-nitb/osmo-nitb", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span> return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb")</span><br><span>@@ -765,7 +765,7 @@</span><br><span> </span><br><span> def vty_command(self):</span><br><span> return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-l", "127.0.0.1", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"]</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span> return (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10926">change 10926</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10926"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 </div>
<div style="display:none"> Gerrit-Change-Number: 10926 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>