laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28563 )
Change subject: Install + package remsim-apitool as separate sub-package
......................................................................
Install + package remsim-apitool as separate sub-package
As the script depends on python3, let's put it into a new
osmo-remsim-apitool package.
Closes: OS#5612
Change-Id: I11d779f66833b5294ffeb422ce6b2a705719a899
---
M contrib/Makefile.am
R contrib/osmo-remsim-apitool
M contrib/osmo-remsim.spec.in
M debian/control
A debian/osmo-remsim-apitool.install
5 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/63/28563/1
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 17f56ed..3db49a4 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,5 @@
SUBDIRS = etc_default systemd
-EXTRA_DIST = remsim-apitool.py owhw-event-script.sh
+EXTRA_DIST = owhw-event-script.sh
+
+bin_SCRIPTS = osmo-remsim-apitool
diff --git a/contrib/remsim-apitool.py b/contrib/osmo-remsim-apitool
similarity index 100%
rename from contrib/remsim-apitool.py
rename to contrib/osmo-remsim-apitool
diff --git a/contrib/osmo-remsim.spec.in b/contrib/osmo-remsim.spec.in
index 3097b8f..150a8ec 100644
--- a/contrib/osmo-remsim.spec.in
+++ b/contrib/osmo-remsim.spec.in
@@ -95,6 +95,17 @@
it maintains a list of clients + bankds connected to it, as well as the
dynamic SIM card mappings between them.
+%package -n osmo-remsim-apitool
+Summary: Osmocom Remote SIM - API tool for Server
+License: GPL-2.0-or-later
+Group: Productivity/Telephony/Servers
+Requires: python3
+
+%description -n osmo-remsim-apitool
+This is a small python tool for generating API requests to remsim-server,
+which can be used by the system administrator to introspect and/or modify
+the state (mostly slotmaps).
+
%package -n osmo-remsim-bankd
Summary: Osmocom Remote SIM - Bank Daemon
License: GPL-2.0-or-later
@@ -191,6 +202,9 @@
%{_bindir}/osmo-remsim-server
%{_unitdir}/osmo-remsim-server.service
+%files -n osmo-remsim-server
+%{_bindir}/osmo-remsim-apitool
+
%files -n osmo-remsim-bankd
%{_bindir}/osmo-remsim-bankd
%{_unitdir}/osmo-remsim-bankd.service
diff --git a/debian/control b/debian/control
index 7a847b8..4fdba3c 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,15 @@
it maintains a list of clients + bankds connected to it, as well as the
dynamic SIM card mappings between them.
+Package: osmo-remsim-apitool
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3
+Description: Osmocom Remote SIM - API tool for server
+ This is a small python tool for generating API requests to remsim-server,
+ which can be used by the system administrator to introspect and/or modify
+ the state (mostly slotmaps).
+
Package: osmo-remsim-bankd
Architecture: any
Multi-Arch: same
diff --git a/debian/osmo-remsim-apitool.install b/debian/osmo-remsim-apitool.install
new file mode 100644
index 0000000..fd47f34
--- /dev/null
+++ b/debian/osmo-remsim-apitool.install
@@ -0,0 +1 @@
+usr/bin/osmo-remsim-apitool
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28563
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I11d779f66833b5294ffeb422ce6b2a705719a899
Gerrit-Change-Number: 28563
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28561 )
Change subject: bankd: log BankID:SlotNr in every log line
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28561
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I84879609781a301338dacde7ff495632e3af08b9
Gerrit-Change-Number: 28561
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 11 Jul 2022 20:27:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28561 )
Change subject: bankd: log BankID:SlotNr in every log line
......................................................................
bankd: log BankID:SlotNr in every log line
It's relatively inconvenient having to mentally map the slot-number to a
thread-id on every (re)connect to correlate the logs.
The logs should contain the Bank/Slot number they relate to.
Closes: OS#5611
Change-Id: I84879609781a301338dacde7ff495632e3af08b9
---
M src/bankd/bankd.h
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/61/28561/1
diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h
index c007802..9bf9bc9 100644
--- a/src/bankd/bankd.h
+++ b/src/bankd/bankd.h
@@ -20,7 +20,7 @@
extern struct value_string worker_state_names[];
#define LOGW(w, fmt, args...) \
- LOGP(DBANKDW, LOGL_INFO, "[%03u %s] " fmt, (w)->num, get_value_string(worker_state_names, (w)->state), \
+ LOGP(DBANKDW, LOGL_INFO, "[%03u B%u:%u %s] " fmt, (w)->num, (w)->slot.bank_id, (w)->slot.slot_nr, get_value_string(worker_state_names, (w)->state), \
## args)
struct bankd;
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28561
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I84879609781a301338dacde7ff495632e3af08b9
Gerrit-Change-Number: 28561
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28549 )
Change subject: trxcon: return prim pointer from l1sched_prim_alloc()
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS3:
> well an _init() function is expected to initialize something that was provided by the caller. […]
Renamed the function in a separate change: https://gerrit.osmocom.org/c/osmocom-bb/+/28560/1, this way it should be cleaner.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28549
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I0fa41cf55e90d191d032bca1754941cca763b03e
Gerrit-Change-Number: 28549
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 11 Jul 2022 20:05:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment