WIP: foris-controller-sentinel-module: package added
Add new package for foris-controller-sentinel-module.
I'm not really sure about dependencies for sentinel, so please take a look a them. Neither am I sure if this is the latest and cleanest version of Makefile for foris-controller module.
Blocked by: turris/foris-controller/foris-controller-sentinel-module!3 (merged)
Merge request reports
Activity
added 1 commit
- 1c925307 - fixup! foris-controller-sentinel-module: package added
marked as a Work In Progress from 1c925307
added 1 commit
- a7ce831a - fixup! fixup! foris-controller-sentinel-module: package added
- Resolved by Josef Schlehofer
added 1 commit
- 87f706f1 - fixup! fixup! fixup! foris-controller-sentinel-module: package added
added 1 commit
- 7f6aadd4 - foris-controller-sentinel-module: package added
Adding @mlenartowicz to keep him informed.
This package is prerequisite for new functionality in reforis.
I am thinking, there should be dependency for
sentinel-eula
.root@turris:/# foris-client -m sentinel -a get_eula mqtt --host localhost --port 11883 --passwd-file /etc/fosquitto/credentials.plain --controller-id 0000000B0000F4EC Traceback (most recent call last): File "/usr/bin/foris-client", line 11, in <module> load_entry_point('foris-client==1.0.3', 'console_scripts', 'foris-client')() File "/__main__.py", line 177, in main File "/mqtt.py", line 358, in send File "/mqtt.py", line 350, in process_resp File "/base.py", line 69, in _raise_exception_on_error foris_client.buses.base.ControllerError__sentinel__get_eula: Controller error(s) has occured: Traceback (most recent call last): File "/message_router.py", line 117, in process_message File "/module_base.py", line 61, in perform_action File "/__init__.py", line 72, in action_get_eula File "/utils.py", line 113, in inner File "/openwrt.py", line 58, in get_eula File "/__init__.py", line 121, in get_eula File "/__init__.py", line 108, in get_valid_eulas File "/__init__.py", line 81, in _file_content FileNotFoundError: [Errno 2] No such file or directory: '/usr/share/sentinel-eula/EULAs.csv' Internal error [Errno 2] No such file or directory: '/usr/share/sentinel-eula/EULAs.csv'('<class 'FileNotFoundError'>')
But I am not sure about this one:
foris-client -m sentinel -a get_settings mqtt --host localhost --port 11883 --passwd-file /etc/fosquitto/credentials.plain --controller-id 0000000B0000F4EC Traceback (most recent call last): File "/usr/bin/foris-client", line 11, in <module> load_entry_point('foris-client==1.0.3', 'console_scripts', 'foris-client')() File "/__main__.py", line 177, in main File "/mqtt.py", line 358, in send File "/mqtt.py", line 350, in process_resp File "/base.py", line 69, in _raise_exception_on_error foris_client.buses.base.ControllerError__sentinel__get_settings: Controller error(s) has occured: Traceback (most recent call last): File "/message_router.py", line 117, in process_message File "/module_base.py", line 61, in perform_action File "/__init__.py", line 34, in action_get_settings File "/utils.py", line 113, in inner File "/openwrt.py", line 40, in get_settings File "/__init__.py", line 48, in get_settings File "/__init__.py", line 45, in _read_uci File "/__init__.py", line 332, in read File "/__init__.py", line 338, in export_data File "/__init__.py", line 173, in _run_uci_command foris_controller.exceptions.UciException: ['uci', '-n', '-c', '/etc/config/', '-P', '/tmp/.uci-foris-controller', 'export', 'sentinel']: command failed (b'uci: Entry not found\n') Internal error ['uci', '-n', '-c', '/etc/config/', '-P', '/tmp/.uci-foris-controller', 'export', 'sentinel']: command failed (b'uci: Entry not found\n')('<class 'foris_controller.exceptions.UciException'>')
/etc/config/sentinel
is provided by packagesentinel-minipot
, which I don't think it is a good idea to have it as dependency inforis-controller-sentinel-module
. @kkoci any thoughts? We both (me and Martin) think that maybe the config can be provided by a different package? It is possible that not everyone would like to have sentinel-minipot installed or being pulled by Foris backend.
assigned to @kkoci and unassigned @jschlehofer
added 1 commit
- 69a4775f - fixup! foris-controller-sentinel-module: package added
Unfortunately there is one minor bug in reading eula file. I'll fix that and release new version of package.
Could anyone take a look and review simple change? turris/foris-controller/foris-controller-sentinel-module!3 (merged)
Edited by Martin Matějek16 PKG_SOURCE_VERSION:=v$(PKG_VERSION) 17 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz 18 19 PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> 20 PKG_LICENSE:=GPL-3.0-or-later 21 PKG_LICENSE_FILES:=LICENSE 22 23 include $(INCLUDE_DIR)/package.mk 24 include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk 25 include ../foris-controller/files/foris-controller-module.mk 26 27 define Package/foris-controller-sentinel-module 28 TITLE:=Foris controller Sentinel module 29 DEPENDS:=\ 30 +foris-controller \ 31 +sentinel-eula +sentinel-proxy changed this line in version 7 of the diff
2 or 4 spaces ideally.
Edited by Josef Schlehofer
added 1 commit
- f67a34fd - fixup! fixup! foris-controller-sentinel-module: package added
added 1 commit
- ec36f5c3 - fixup! fixup! fixup! foris-controller-sentinel-module: package added
added 1 commit
- 33755c8a - fixup! fixup! fixup! fixup! foris-controller-sentinel-module: package added
added 1 commit
- 62d4172d - foris-controller-sentinel-module: package added
added 24 commits
-
62d4172d...4fe8a20b - 23 commits from branch
develop
- 00dc35e2 - foris-controller-sentinel-module: package added
-
62d4172d...4fe8a20b - 23 commits from branch
With turris/foris-controller/foris-controller-sentinel-module!3 (merged) resolved, I think we are good to go.
assigned to @jschlehofer and unassigned @mmatejek
changed milestone to %Turris OS 5.0