ccc976984d
frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem
...
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there
Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-24 14:59:00 +02:00
ffe5f52790
frappy_psi.sea: avoid error on import
...
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used
+ use updateItem instead of updateEvent to avoid pylint complaint
Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-10-16 11:15:27 +02:00
Alexander Zaft
e1458471a8
psi: change open calls in sea
...
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-23 08:07:23 +02:00
Alexander Zaft
c550721e2d
generalConfig, config: use pathlib
...
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
with pathsep
Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-09-19 13:34:14 +02:00
Jens Krüger
fb9e713043
SINQ/SEA: Fix import error due to None value
...
If the environment variable isn't set a None value is returned. Now an
empty string will be returned
Fixes : #4882
Change-Id: I3e319daebf10e2d8ea3ee00f6094e6896e54f51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34234
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
2024-08-05 10:12:38 +02:00
e0e90c4000
frappy_psi.sea: use raise from
...
this was complained by Jenkins after merging (1)
Change-Id: I9e4eb57004d218021978d6e9e06e1cbd42ec5e9c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34024
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-06-24 17:03:47 +02:00
81002c2568
frappy_psi.sea: use ReadFailedError
...
change error class on reading parameters in SEA from HardwareError
to ReadFailed. This is in most cases more appropriate.
TODO: find errors in SEA that should be should be HardwareErrors
and a mechanism to indicate this
+ for errors related to disabled modules use the DISABLED status
Change-Id: I0342a34185a66dcf874c6ca034b7cefc98bf9c8a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34022
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-24 13:40:33 +02:00
7dc4cf7029
frappy_psi.sea: various improvments
...
- always open asynio and syncio connections (conenctions for
update and command)
- better synchronization when reconnecting using threading.Event
- nicer error messages
Change-Id: Ia435c3ccfa2732be4aa9f24a3b6e8484fab715a3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33909
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:54:00 +02:00
c5c479f424
frappy_psi.sea: workaround for bug in sea
...
hdb path should not contain duble slash. replace double slash
by single slash
Change-Id: Ia2ce3be9a75d68fcc7efe3eb3dbd19a7907a73ff
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32705
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-12-07 08:18:57 +01:00
Alexander Zaft
757e96e7c0
core: move module handling out of dispatcher
...
Split module handling code from the dispatcher.
The new class for managing Modules is called SecNode.
* change logging to no longer need a reference to modobj
* modules get a reference to the secnode obj instead of the
dispatcher
* intermediate usage fixes for frappy_psi/sea
Change-Id: Ifee4bb47aa7a4508bb4a47c9a5873b7e2d5faf67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32249
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2023-10-11 14:41:49 +02:00
Alexander Zaft
a3651f71f2
psi: fix Done import in sea
...
Wasn't caught during change 31697. Imports Done from modulebase instead
of modules
Change-Id: I54389f83092fef7847867a7e6681fc36c42ff446
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32265
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-05 16:04:10 +02:00
4f86fc5c3c
frappy_psi.sea: small fixes
...
- changes in return value of frappy_config command in sea
- do not store sea manager
Change-Id: I5bc1d9a281ad2285b90d3649b4c702a3501d451d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32166
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-19 10:57:01 +02:00
19c0bcdf14
psi: improve sea interface
...
- get return value from teh frappy-config script in order
to detect failures
- call config_check not more than once within 1 sec
Change-Id: Ibe42e846521206463f2761d452aea7e558a36854
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 08:48:16 +02:00
285df89d4d
frappy_psi.sea: further bug fixes
...
- in SEA, it is not guaranteed that the is_running state is set
before the run command returns. as a consequence, we have to
wait in SeaDrivable.write_target for is_running being set
- syncio has always to be reconnected after asynio
Change-Id: Ia46cff11de86868ce0627faaf6f776282bd7a8f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31631
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-07-10 18:32:52 +02:00
78e8b9127f
frappy_psi.sea: avoid multiple connections
...
the _connect method was sometimes started in parallel
from startModules and the first call to doPoll.
remove the first one, and protect the second one
with a lock
Change-Id: I079439e150efd5d005130cef475f6326f933ecbd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31611
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-07-07 15:49:18 +02:00
9ece4f797b
frappy_psi.sea: try to reconnect on failure
...
both .asynio and .syncio connection should be tried to reopen.
Change-Id: I836ede1e5fff6f7ac670c92e769da8ec834d2b12
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31449
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-06-28 17:33:40 +02:00
5727ecbc7f
frappy_psi.sea: bug fixes
...
- left over fixes from config file format change
- sea enums might be texts - create SeaEnum datatype for this
Change-Id: I1f1baeeb4d6a0b13b5ec42d651bc0fc37b0fdf2c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31380
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-06-20 09:39:02 +02:00
ccb33b81b3
add sea driver
...
+ fix a bug in frappy.client.ProxyClient: move CacheItem stuff to
frappy.client.SecopClient.updateValue, as ProxyClient is used by
SeaClient and does not know Frappy datatypes
Change-Id: I3aef9fdddbdd2bbef0c56a10c8a8031e4acc5993
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31065
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-09 14:49:21 +02:00
