August 2025 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-abis[master]: Create rpm make targets and add libosmo-abis.spec.in

by Paul Bichis

Paul Bichis has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40833?usp=email ) Change subject: Create rpm make targets and add libosmo-abis.spec.in ...................................................................... Create rpm make targets and add libosmo-abis.spec.in Change-Id: I86c2c621887d1d9352f3ddfa1270c1379cf50fd9 --- M Makefile.am A contrib/libosmo-abis.spec.in 2 files changed, 196 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/33/40833/1 diff --git a/Makefile.am b/Makefile.am index 790d055..054465e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,102 @@ EXTRA_DIST = \ .version \ README.md \ + contrib/libosmo-abis.spec.in \ debian \ git-version-gen \ $(NULL) @RELMAKE@ + +# RPM packaging support with proper Git version handling +EXTRA_DIST += contrib/libosmo-abis.spec + +# Git version variables +PKGNAME := libosmo-abis +VERSION := 1.6 +RELEASE := 1 +TARNAME := $(PKGNAME)-$(VERSION)-$(RELEASE) +TARFILE := $(TARNAME).tar.gz +SRPMDIR := $(HOME)/rpmbuild/SRPMS +GITTAG := $(shell LANG=C LC_MESSAGES=C git tag 2>/dev/null | tail -n 1) +GIT_HASH := $(shell LANG=C LC_MESSAGES=C git rev-list -n1 HEAD 2>tmp.txt) +GIT_ERR := $(shell LANG=C LC_MESSAGES=C cat tmp.txt 2>/dev/null; rm -f tmp.txt 2>/dev/null ) +SUFFIX := +RPMOPT := + +.PHONY: rpm srpm rpm-clean tarball check-gittag check-githash srpm-git build-git build-srpm rpm-head srpm-head + +tarball: clean + @echo "Creating tarball..." + @mkdir -p tarballs + @wd=`pwd|sed 's,^.*/,,'`; \ + mkdir -p tarballs; cd ..; \ + find $$wd -name .git >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.gitignore' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*~' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*.o' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*.lo' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.libs' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.deps' >>$$wd/tarballs/tar-exclude; \ + tar czf $$wd/tarballs/$(TARFILE) --exclude $$wd/Makefile.local --exclude $$wd/tarballs -X $$wd/tarballs/tar-exclude --transform "s,^$$wd,$(PKGNAME)-$(VERSION)," $$wd; \ + rm $$wd/tarballs/tar-exclude; \ + echo "Created tarballs/$(TARFILE)" + +rpm: tarball + rpmbuild -tb --define 'tarname $(TARNAME)' --define 'revision $(if $(SUFFIX),$(SUFFIX),%{nil})' $(RPMOPT) tarballs/$(TARFILE) + +srpm: tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision $(if $(SUFFIX),$(SUFFIX),%{nil})' $(RPMOPT) tarballs/$(TARFILE) + +# build packages from GIT HEAD +rpm-head: check-githash tarball + rpmbuild -tb --define 'tarname $(TARNAME)' --define 'revision _$(GIT_HASH)git' $(RPMOPT) tarballs/$(TARFILE) + +srpm-head: check-githash tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision _$(GIT_HASH)git' $(RPMOPT) tarballs/$(TARFILE) + +# build packages with tagged version +srpm-git: check-gittag tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision _t$(GITTAG)$(SUFFIX)' $(RPMOPT) tarballs/$(TARFILE) + +check-gittag: check-githash + @tag_hash=""; \ + if [ "" != "$(GITTAG)" ]; then \ + tag_hash=`LANG=C LC_MESSAGES=C git rev-list -n1 $(GITTAG) 2>/dev/null`; \ + else \ + echo "No available GIT tag"; \ + exit 1; \ + fi; \ + if [ "x$(GIT_HASH)" != "x$$tag_hash" ]; then \ + echo "Current commit hash $(GIT_HASH) different from expected hash for tag $(GITTAG) ($$tag_hash)"; \ + exit 1; \ + fi; + +check-githash: + @if [ "x" = "x$(GIT_HASH)" ]; then \ + echo "Could not obtain last GIT commit hash. GIT Error:"; \ + echo "$(GIT_ERR)"; \ + exit 1; \ + fi; + +build-git: check-gittag + @for f in "$(SRPMDIR)/$(TARNAME)_t$(GITTAG)$(SUFFIX)."*.src.rpm ; do \ + if [ -s "$$f" ]; then \ + echo "Already having $$f"; \ + exit; \ + fi \ + done ; \ + $(MAKE) srpm-git + +build-srpm: + @for f in "$(SRPMDIR)/$(TARNAME)$(SUFFIX)."*.src.rpm ; do \ + if [ -s "$$f" ]; then \ + echo "Already having $$f"; \ + exit; \ + fi \ + done ; \ + $(MAKE) srpm + +rpm-clean: + @echo "Cleaning RPM build directories..." + @rm -rf rpm tarballs tmp.txt diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in new file mode 100644 index 0000000..56e1a0c --- /dev/null +++ b/contrib/libosmo-abis.spec.in @@ -0,0 +1,102 @@ +# libosmo-abis.spec + +%{!?dist:%define dist %{?distsuffix:%distsuffix%{?product_version}}} +%{!?distribution: %define distribution %(sed -E 's/ Linux release / /' /etc/redhat-release)} +%define systemd %(test -x /usr/bin/systemctl && echo 1 || echo 0) +%{!?_unitdir:%define _unitdir /usr/lib/systemd/system} +%define buildnum 1 +%{!?tarname:%define tarname %{name}-%{version}-%{buildnum}} + + +Name: libosmo-abis +Version: 1.6.0 +Release: %{buildnum}%{?revision}%{?dist} +Summary: Osmocom ABIS library +License: GPL-2.0-or-later +Group: Productivity/Telephony/Utilities +URL: https://github.com/yremora/osmo/tree/main/libosmo-abis +Source: %{tarname}.tar.gz +BuildRequires: automake +BuildRequires: libtool >= 2 +BuildRequires: pkgconfig >= 0.20 +BuildRequires: pkgconfig(libosmocore) >= 1.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.11.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.11.0 +BuildRequires: pkgconfig(libosmovty) >= 1.11.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.6.0 + +%description +ABIS interface handling library for yREMORA telecom projects. + +%package -n libosmoabis15 +Summary: Osmocom ABIS library +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmoabis15 +ABIS interface handling library for yREMORA telecom projects. + +%package -n libosmotrau11 +Summary: Osmocom TRAU library +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmotrau11 +TRAU (Transcoding and Rate Adaptation Unit) library for yREMORA telecom projects. + +%package -n libosmo-abis-devel +Summary: Development files for the Osmocom ABIS library +License: AGPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmoabis15 = %{version} +Requires: libosmotrau11 = %{version} + +%description -n libosmo-abis-devel +ABIS interface handling library for yREMORA telecom projects. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmo-abis. + +%prep +%setup -q + +%build +echo "%{version}" >.tarball-version +autoreconf -fiv +%configure --enable-shared --disable-static --includedir="%{_includedir}/%{name}" +make %{?_smp_mflags} + +%install +%make_install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) + +%post -n libosmoabis15 -p /sbin/ldconfig +%postun -n libosmoabis15 -p /sbin/ldconfig + +%post -n libosmotrau11 -p /sbin/ldconfig +%postun -n libosmotrau11 -p /sbin/ldconfig + +%files -n libosmoabis15 +%{_libdir}/libosmoabis.so.15* + +%files -n libosmotrau11 +%{_libdir}/libosmotrau.so.11* + +%files -n libosmo-abis-devel +%license COPYING +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/osmocom +%{_includedir}/%{name}/osmocom/abis/ +%{_includedir}/%{name}/osmocom/trau/ +%{_libdir}/libosmoabis.so +%{_libdir}/libosmotrau.so +%{_libdir}/pkgconfig/libosmoabis.pc +%{_libdir}/pkgconfig/libosmotrau.pc + +%changelog +* %(date "+%%a %%b %%d %%Y") Paul Bichis <paul(a)afk.ro> - %{version}-%{release} +- Initial RPM package for %{name} packaged for %{distribution} +- Added proper RPM packaging with BuildRequires and Requires -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40833?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I86c2c621887d1d9352f3ddfa1270c1379cf50fd9 Gerrit-Change-Number: 40833 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Bichis <paul(a)afk.ro>

1 month

1
0
0 0

[M] Change in libosmo-abis[master]: Create rpm make targets and add libosmo-abis.spec.in

by Paul Bichis

Paul Bichis has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40832?usp=email ) Change subject: Create rpm make targets and add libosmo-abis.spec.in ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40832?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I199d1168538b5220571c42b1fc35c7f5f9f3e4b4 Gerrit-Change-Number: 40832 Gerrit-PatchSet: 2 Gerrit-Owner: Paul Bichis <paul(a)afk.ro> Gerrit-Reviewer: Jenkins Builder

1 month

1
0
0 0

[M] Change in libosmo-abis[master]: Create rpm make targets and add libosmo-abis.spec.in

by Paul Bichis

Paul Bichis has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40832?usp=email ) Change subject: Create rpm make targets and add libosmo-abis.spec.in ...................................................................... Create rpm make targets and add libosmo-abis.spec.in Change-Id: I199d1168538b5220571c42b1fc35c7f5f9f3e4b4 --- M Makefile.am A contrib/libosmo-abis.spec.in 2 files changed, 199 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/32/40832/1 diff --git a/Makefile.am b/Makefile.am index 790d055..054465e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,102 @@ EXTRA_DIST = \ .version \ README.md \ + contrib/libosmo-abis.spec.in \ debian \ git-version-gen \ $(NULL) @RELMAKE@ + +# RPM packaging support with proper Git version handling +EXTRA_DIST += contrib/libosmo-abis.spec + +# Git version variables +PKGNAME := libosmo-abis +VERSION := 1.6 +RELEASE := 1 +TARNAME := $(PKGNAME)-$(VERSION)-$(RELEASE) +TARFILE := $(TARNAME).tar.gz +SRPMDIR := $(HOME)/rpmbuild/SRPMS +GITTAG := $(shell LANG=C LC_MESSAGES=C git tag 2>/dev/null | tail -n 1) +GIT_HASH := $(shell LANG=C LC_MESSAGES=C git rev-list -n1 HEAD 2>tmp.txt) +GIT_ERR := $(shell LANG=C LC_MESSAGES=C cat tmp.txt 2>/dev/null; rm -f tmp.txt 2>/dev/null ) +SUFFIX := +RPMOPT := + +.PHONY: rpm srpm rpm-clean tarball check-gittag check-githash srpm-git build-git build-srpm rpm-head srpm-head + +tarball: clean + @echo "Creating tarball..." + @mkdir -p tarballs + @wd=`pwd|sed 's,^.*/,,'`; \ + mkdir -p tarballs; cd ..; \ + find $$wd -name .git >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.gitignore' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*~' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*.o' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '*.lo' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.libs' >>$$wd/tarballs/tar-exclude; \ + find $$wd -name '.deps' >>$$wd/tarballs/tar-exclude; \ + tar czf $$wd/tarballs/$(TARFILE) --exclude $$wd/Makefile.local --exclude $$wd/tarballs -X $$wd/tarballs/tar-exclude --transform "s,^$$wd,$(PKGNAME)-$(VERSION)," $$wd; \ + rm $$wd/tarballs/tar-exclude; \ + echo "Created tarballs/$(TARFILE)" + +rpm: tarball + rpmbuild -tb --define 'tarname $(TARNAME)' --define 'revision $(if $(SUFFIX),$(SUFFIX),%{nil})' $(RPMOPT) tarballs/$(TARFILE) + +srpm: tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision $(if $(SUFFIX),$(SUFFIX),%{nil})' $(RPMOPT) tarballs/$(TARFILE) + +# build packages from GIT HEAD +rpm-head: check-githash tarball + rpmbuild -tb --define 'tarname $(TARNAME)' --define 'revision _$(GIT_HASH)git' $(RPMOPT) tarballs/$(TARFILE) + +srpm-head: check-githash tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision _$(GIT_HASH)git' $(RPMOPT) tarballs/$(TARFILE) + +# build packages with tagged version +srpm-git: check-gittag tarball + rpmbuild -ta --define 'tarname $(TARNAME)' --define 'revision _t$(GITTAG)$(SUFFIX)' $(RPMOPT) tarballs/$(TARFILE) + +check-gittag: check-githash + @tag_hash=""; \ + if [ "" != "$(GITTAG)" ]; then \ + tag_hash=`LANG=C LC_MESSAGES=C git rev-list -n1 $(GITTAG) 2>/dev/null`; \ + else \ + echo "No available GIT tag"; \ + exit 1; \ + fi; \ + if [ "x$(GIT_HASH)" != "x$$tag_hash" ]; then \ + echo "Current commit hash $(GIT_HASH) different from expected hash for tag $(GITTAG) ($$tag_hash)"; \ + exit 1; \ + fi; + +check-githash: + @if [ "x" = "x$(GIT_HASH)" ]; then \ + echo "Could not obtain last GIT commit hash. GIT Error:"; \ + echo "$(GIT_ERR)"; \ + exit 1; \ + fi; + +build-git: check-gittag + @for f in "$(SRPMDIR)/$(TARNAME)_t$(GITTAG)$(SUFFIX)."*.src.rpm ; do \ + if [ -s "$$f" ]; then \ + echo "Already having $$f"; \ + exit; \ + fi \ + done ; \ + $(MAKE) srpm-git + +build-srpm: + @for f in "$(SRPMDIR)/$(TARNAME)$(SUFFIX)."*.src.rpm ; do \ + if [ -s "$$f" ]; then \ + echo "Already having $$f"; \ + exit; \ + fi \ + done ; \ + $(MAKE) srpm + +rpm-clean: + @echo "Cleaning RPM build directories..." + @rm -rf rpm tarballs tmp.txt diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in new file mode 100644 index 0000000..2d36612 --- /dev/null +++ b/contrib/libosmo-abis.spec.in @@ -0,0 +1,105 @@ +# libosmo-abis.spec + +%define Recommends() %(LANG=C LC_MESSAGES=C rpm --help | fgrep -q ' --recommends ' && echo "Recommends:" || echo "##") +%{!?dist:%define dist %{?distsuffix:%distsuffix%{?product_version}}} +%{!?distribution: %define distribution %(sed -E 's/ Linux release / /' /etc/redhat-release)} +%define systemd %(test -x /usr/bin/systemctl && echo 1 || echo 0) +%{!?_unitdir:%define _unitdir /usr/lib/systemd/system} +%define buildnum 1 +%{!?tarname:%define tarname %{name}-%{version}-%{buildnum}} +%{!?distribution: %define distribution %(sed -E 's/ Linux release / /' /etc/redhat-release)} + +Name: libosmo-abis +Version: 1.6.0 +Release: %{buildnum}%{?revision}%{?dist} +Summary: Osmocom ABIS library +License: GPL-2.0-or-later +Group: Productivity/Telephony/Utilities +URL: https://github.com/yremora/osmo/tree/main/libosmo-abis +Source: %{tarname}.tar.gz +BuildRequires: automake +BuildRequires: libtool >= 2 +BuildRequires: pkgconfig >= 0.20 +BuildRequires: pkgconfig(libosmocore) >= 1.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.11.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.11.0 +BuildRequires: pkgconfig(libosmovty) >= 1.11.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.6.0 + +%description +ABIS interface handling library for yREMORA telecom projects. + +%package -n libosmoabis15 +Summary: Osmocom ABIS library +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmoabis15 +ABIS interface handling library for yREMORA telecom projects. + +%package -n libosmotrau11 +Summary: Osmocom TRAU library +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmotrau11 +TRAU (Transcoding and Rate Adaptation Unit) library for yREMORA telecom projects. + +%package -n libosmo-abis-devel +Summary: Development files for the Osmocom ABIS library +License: AGPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmoabis15 = %{version} +Requires: libosmotrau11 = %{version} + +%description -n libosmo-abis-devel +ABIS interface handling library for yREMORA telecom projects. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmo-abis. + +%prep +%setup -q + +%build +echo "%{version}" >.tarball-version +autoreconf -fiv +%configure --enable-shared --disable-static --includedir="%{_includedir}/%{name}" +make %{?_smp_mflags} + +%install +%make_install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) + +%post -n libosmoabis15 -p /sbin/ldconfig +%postun -n libosmoabis15 -p /sbin/ldconfig + +%post -n libosmotrau11 -p /sbin/ldconfig +%postun -n libosmotrau11 -p /sbin/ldconfig + +%files -n libosmoabis15 +%{_libdir}/libosmoabis.so.15* + +%files -n libosmotrau11 +%{_libdir}/libosmotrau.so.11* + +%files -n libosmo-abis-devel +%license COPYING +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/osmocom +%{_includedir}/%{name}/osmocom/abis/ +%{_includedir}/%{name}/osmocom/trau/ +%{_libdir}/libosmoabis.so +%{_libdir}/libosmotrau.so +%{_libdir}/pkgconfig/libosmoabis.pc +%{_libdir}/pkgconfig/libosmotrau.pc + +%changelog +* %(date "+%%a %%b %%d %%Y") yREMORA <yremora(a)example.com> - %{version}-%{release} +- Initial RPM package for %{name} packaged for %{distribution} +- Updated dependencies to use 1.11 format (without .0) +- Added proper RPM packaging with BuildRequires and Requires +- yREMORA enhanced version for telecom projects -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40832?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I199d1168538b5220571c42b1fc35c7f5f9f3e4b4 Gerrit-Change-Number: 40832 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Bichis <paul(a)afk.ro>

1 month

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enb_uptime: track eNB uptime

by jolly

Attention is currently required from: fixeria. jolly has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email ) Change subject: enb_uptime: track eNB uptime ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie8a06fafa2ce3e7a5aec1eb8e71af3053599cf24 Gerrit-Change-Number: 40831 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Aug 2025 11:24:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enb_uptime: track eNB uptime

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email ) Change subject: enb_uptime: track eNB uptime ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie8a06fafa2ce3e7a5aec1eb8e71af3053599cf24 Gerrit-Change-Number: 40831 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 05 Aug 2025 11:16:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 month

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enb_uptime: track eNB uptime

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email ) Change subject: enb_uptime: track eNB uptime ...................................................................... enb_uptime: track eNB uptime Change-Id: Ie8a06fafa2ce3e7a5aec1eb8e71af3053599cf24 Related: SYS#7594 --- M include/s1gw_metrics.hrl A src/enb_uptime.erl M src/s1ap_proxy.erl 3 files changed, 107 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/40831/1 diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index db087c5..83ec768 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -37,9 +37,10 @@ -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, [ctr, s1ap, proxy, out_pkt, reply, all]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, [ctr, s1ap, proxy, out_pkt, reply, erab_setup_rsp]). -%% GTP-U (traffic) related counters +%% per-eNB counters %% NOTE: these counters shall not be listed in ?S1GW_COUNTERS, %% but created dynamically for each connecting eNB. +-define(S1GW_CTR_ENB_UPTIME(ENBId), [ctr, enb, ENBId, uptime]). -define(S1GW_CTR_GTPU_PACKETS(ENBId, UDL), [ctr, enb, ENBId, gtpu, packets, UDL]). -define(S1GW_CTR_GTPU_BYTES_UE(ENBId, UDL), [ctr, enb, ENBId, gtpu, bytes, ue, UDL]). -define(S1GW_CTR_GTPU_BYTES_TOTAL(ENBId, UDL), [ctr, enb, ENBId, gtpu, bytes, total, UDL]). diff --git a/src/enb_uptime.erl b/src/enb_uptime.erl new file mode 100644 index 0000000..4c6f76a --- /dev/null +++ b/src/enb_uptime.erl @@ -0,0 +1,99 @@ +%% Copyright (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> +%% +%% All Rights Reserved +%% +%% SPDX-License-Identifier: AGPL-3.0-or-later +%% +%% This program is free software; you can redistribute it and/or modify +%% it under the terms of the GNU Affero General Public License as +%% published by the Free Software Foundation; either version 3 of the +%% License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU Affero General Public License +%% along with this program. If not, see <https://www.gnu.org/licenses/>. +%% +%% Additional Permission under GNU AGPL version 3 section 7: +%% +%% If you modify this Program, or any covered work, by linking or +%% combining it with runtime libraries of Erlang/OTP as released by +%% Ericsson on https://www.erlang.org (or a modified version of these +%% libraries), containing parts covered by the terms of the Erlang Public +%% License (https://www.erlang.org/EPLICENSE), the licensors of this +%% Program grant you additional permission to convey the resulting work +%% without the need to license the runtime libraries of Erlang/OTP under +%% the GNU Affero General Public License. Corresponding Source for a +%% non-source form of such a combination shall include the source code +%% for the parts of the runtime libraries of Erlang/OTP used as well as +%% that of the covered work. + +-module(enb_uptime). + +-export([start_link/0, + genb_id_ind/2, + shutdown/1]). + +-include_lib("kernel/include/logger.hrl"). + +-include("s1gw_metrics.hrl"). + +-define(INTERVAL, 5_000). + + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +-spec start_link() -> pid(). +start_link() -> + T0 = erlang:monotonic_time(), + spawn_link(fun() -> loop(#{time => T0}) end). + + +-spec genb_id_ind(pid(), string()) -> ok. +genb_id_ind(Pid, GlobalENBId) -> + Pid ! {?FUNCTION_NAME, GlobalENBId}, + ok. + + +-spec shutdown(pid()) -> ok. +shutdown(Pid) -> + Pid ! stop, + ok. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +loop(#{genb_id := GlobalENBId, time := T0} = S) -> + receive + stop -> + s1gw_metrics:ctr_reset(?S1GW_CTR_ENB_UPTIME(GlobalENBId)), + ok; + Event -> + ?LOG_ERROR("Rx unexpected event: ~p", [Event]) + after ?INTERVAL -> + T1 = erlang:monotonic_time(), + Diff = erlang:convert_time_unit(T1 - T0, native, second), + s1gw_metrics:ctr_inc(?S1GW_CTR_ENB_UPTIME(GlobalENBId), Diff), + ?LOG_INFO("Td ~p second(s)", [Diff]), + loop(S#{time => T1}) + end; + +loop(#{} = S) -> + receive + {genb_id_ind, GlobalENBId} -> + catch exometer:new(?S1GW_CTR_ENB_UPTIME(GlobalENBId), counter), + loop(S#{genb_id => GlobalENBId}); + Event -> + ?LOG_ERROR("Rx unexpected event: ~p", [Event]) + end. + + +%% vim:set ts=4 sw=4 et: diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 06e5302..813a8d1 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -78,7 +78,8 @@ mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), - path :: [s1ap_ie_id()] + path :: [s1ap_ie_id()], + enb_uptime :: pid() }). -type proxy_state() :: #proxy_state{}. @@ -127,7 +128,8 @@ init([ConnInfo]) -> process_flag(trap_exit, true), - {ok, #proxy_state{conn_info = ConnInfo, + {ok, #proxy_state{enb_uptime = enb_uptime:start_link(), + conn_info = ConnInfo, erabs = dict:new(), path = []}}. @@ -167,7 +169,8 @@ {noreply, S}. -terminate(Reason, #proxy_state{}) -> +terminate(Reason, #proxy_state{} = S) -> + enb_uptime:shutdown(S#proxy_state.enb_uptime), ?LOG_NOTICE("Terminating, reason ~p", [Reason]), ok. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40831?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie8a06fafa2ce3e7a5aec1eb8e71af3053599cf24 Gerrit-Change-Number: 40831 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month

1
0
0 0

[XL] Change in pysim[master]: add test_configurable_parameters.py

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40823?usp=email to look at the new patch set (#3). Change subject: add test_configurable_parameters.py ...................................................................... add test_configurable_parameters.py Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 --- M pySim/esim/saip/personalization.py A tests/unittests/smdpp_data A tests/unittests/test_configurable_parameters.py A tests/unittests/xo/test_configurable_parameters 4 files changed, 1,420 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/40823/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 Gerrit-Change-Number: 40823 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[XL] Change in pysim[master]: add test_configurable_parameters.py

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/40823?usp=email ) Change subject: add test_configurable_parameters.py ...................................................................... Patch Set 2: (1 comment) File pySim/esim/saip/personalization.py: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/pysim/+/40823/comment/68419ca3_39b35105?usp=em… : PS2, Line 231: where each occurence should reflect the same value (all currently known parameters). 'occurence' may be misspelled - perhaps 'occurrence'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 Gerrit-Change-Number: 40823 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Aug 2025 02:07:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month

1
0
0 0

[XS] Change in pysim[master]: use secrets.SystemRandom as secure random nr source

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40830?usp=email ) Change subject: use secrets.SystemRandom as secure random nr source ...................................................................... use secrets.SystemRandom as secure random nr source secrets.SystemRandom is defined as the most secure random source available on the given operating system. Change-Id: I8049cd1292674b3ced82b0926569128535af6efe --- M pySim/esim/saip/param_source.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/40830/1 diff --git a/pySim/esim/saip/param_source.py b/pySim/esim/saip/param_source.py index 46a04fb..f5d2a35 100644 --- a/pySim/esim/saip/param_source.py +++ b/pySim/esim/saip/param_source.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import random +import secrets import re from pySim.utils import all_subclasses_of from osmocom.utils import b2h @@ -94,7 +94,7 @@ return cls(cls.expand_str(s)) class RandomSourceMixin: - random_impl = random.SystemRandom() + random_impl = secrets.SystemRandom() class RandomDigitSource(InputExpandingParamSource, RandomSourceMixin): 'return a different sequence of random decimal digits each' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40830?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8049cd1292674b3ced82b0926569128535af6efe Gerrit-Change-Number: 40830 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in pysim[master]: use random.SystemRandom as random nr source (/dev/urandom)

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40829?usp=email ) Change subject: use random.SystemRandom as random nr source (/dev/urandom) ...................................................................... use random.SystemRandom as random nr source (/dev/urandom) /dev/urandom is somewhat better than python's PRNG Change-Id: I6de38c14ac6dd55bc84d53974192509c18d02bfa --- M pySim/esim/saip/param_source.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/29/40829/1 diff --git a/pySim/esim/saip/param_source.py b/pySim/esim/saip/param_source.py index aaef68a..46a04fb 100644 --- a/pySim/esim/saip/param_source.py +++ b/pySim/esim/saip/param_source.py @@ -94,7 +94,7 @@ return cls(cls.expand_str(s)) class RandomSourceMixin: - random_impl = random # TODO secure random source? + random_impl = random.SystemRandom() class RandomDigitSource(InputExpandingParamSource, RandomSourceMixin): 'return a different sequence of random decimal digits each' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6de38c14ac6dd55bc84d53974192509c18d02bfa Gerrit-Change-Number: 40829 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025