frappy.show: do not show nicos column if equal to frappy
This commit is contained in:
12
devices.py
12
devices.py
@ -211,6 +211,8 @@ class FrappyConfig(Device):
|
||||
cfgs = current_cfgs
|
||||
fm = FrappyManager()
|
||||
proposed = fm.get_server_state(config.instrument, cfgs)
|
||||
if fm.error:
|
||||
self.log.error('%s', fm.error)
|
||||
changes = dict(proposed)
|
||||
need_change = False
|
||||
for service in SERVICES:
|
||||
@ -407,13 +409,17 @@ class FrappyConfig(Device):
|
||||
session.log.info(' %s', 75*'_')
|
||||
session.log.info(' ')
|
||||
kwargs = {}
|
||||
frappy_equals_given = True
|
||||
rows = [['service', 'sea', 'frappy', 'nicos', 'proposed'], [''] * 5]
|
||||
for service in SERVICES:
|
||||
cfg = changes.get(service)
|
||||
if not (cfg is None or isinstance(cfg, Keep)):
|
||||
kwargs[service] = str(cfg)
|
||||
frappy_cfg = fm.frappy_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,
|
||||
prev, '-' if cfg is None else cfg])
|
||||
try:
|
||||
@ -424,6 +430,8 @@ class FrappyConfig(Device):
|
||||
for row in rows:
|
||||
if not kwargs:
|
||||
row.pop()
|
||||
if frappy_equals_given:
|
||||
row.pop()
|
||||
session.log.info(' %s', ' '.join(v.ljust(w) for w, v in zip(wid, row)))
|
||||
if self._rebuild_env:
|
||||
session.log.info(' %s', self._rebuild_env)
|
||||
|
Reference in New Issue
Block a user