linse/frappy_sinq
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy.show: do not show nicos column if equal to frappy

Browse Source
This commit is contained in:
zolliker
2024-05-13 15:02:59 +02:00
parent 3bddd87609
commit e841b7bf0e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
devices.py
View File

@ -211,6 +211,8 @@ class FrappyConfig(Device):
cfgs = current_cfgs cfgs = current_cfgs
fm = FrappyManager() fm = FrappyManager()
proposed = fm.get_server_state(config.instrument, cfgs) proposed = fm.get_server_state(config.instrument, cfgs)
if fm.error:
self.log.error('%s', fm.error)
changes = dict(proposed) changes = dict(proposed)
need_change = False need_change = False
for service in SERVICES: for service in SERVICES:
@ -407,13 +409,17 @@ class FrappyConfig(Device):
session.log.info(' %s', 75*'_') session.log.info(' %s', 75*'_')
session.log.info(' ') session.log.info(' ')
kwargs = {} kwargs = {}
frappy_equals_given = True
rows = [['service', 'sea', 'frappy', 'nicos', 'proposed'], [''] * 5] rows = [['service', 'sea', 'frappy', 'nicos', 'proposed'], [''] * 5]
for service in SERVICES: for service in SERVICES:
cfg = changes.get(service) cfg = changes.get(service)
if not (cfg is None or isinstance(cfg, Keep)):
kwargs[service] = str(cfg)
frappy_cfg = fm.frappy_cfgs.get(service, '-') frappy_cfg = fm.frappy_cfgs.get(service, '-')
prev = self._target_cfgs.get(service, '-') prev = self._target_cfgs.get(service, '-')
if not (cfg is None or isinstance(cfg, Keep)):
kwargs[service] = str(cfg)
frappy_equals_given = False
elif frappy_cfg != prev:
frappy_equals_given = False
rows.append([service, fm.sea_cfgs.get(service, '-'), frappy_cfg, rows.append([service, fm.sea_cfgs.get(service, '-'), frappy_cfg,
prev, '-' if cfg is None else cfg]) prev, '-' if cfg is None else cfg])
try: try:
@ -424,6 +430,8 @@ class FrappyConfig(Device):
for row in rows: for row in rows:
if not kwargs: if not kwargs:
row.pop() row.pop()
if frappy_equals_given:
row.pop()
session.log.info(' %s', ' '.join(v.ljust(w) for w, v in zip(wid, row))) session.log.info(' %s', ' '.join(v.ljust(w) for w, v in zip(wid, row)))
if self._rebuild_env: if self._rebuild_env:
session.log.info(' %s', self._rebuild_env) session.log.info(' %s', self._rebuild_env)