diff --git a/devices.py b/devices.py index c191101..0c35523 100644 --- a/devices.py +++ b/devices.py @@ -192,7 +192,7 @@ class FrappyConfig(Device): if busy or fm.state == prev_shown: continue self._back_to_normal = 0 # indicates that we had a change - self.show_state(True, to_consider) + self.show(True, to_consider) prev_shown = fm.state def to_consider(self, cfgs=None): @@ -337,9 +337,6 @@ class FrappyConfig(Device): self._restarting = False return all_cfg - def show(self): - return self(update=False) - def __call__(self, *args, main=None, stick=None, addons=None, force=False, update=True): """(re)start frappy server(s) with given configs and load setup if needed @@ -391,7 +388,7 @@ class FrappyConfig(Device): if update and need_change: self.update() else: - self.show_state(False, to_consider) + self.show(False, to_consider) return if confirmed and main not in (None, 'restart') and confirmed.lower() != main.lower() and not force: session.log.warning('%r is plugged to the cryostat control rack', confirmed) @@ -400,7 +397,7 @@ class FrappyConfig(Device): raise TypeError('refuse to override plugged device') session.log.info(all_info(self.start_services(main, stick, addons))) - def show_state(self, changes_only=False, consider_result=None): + def show(self, changes_only=False, consider_result=None): need_changes, changes, fm = consider_result or self.to_consider() if need_changes: session.log.warning('sample environment configuration should be changed:') @@ -570,8 +567,8 @@ class FrappyConfig(Device): continue # determine aliases for aliasname in aliasnames: - if aliasname not in needed_aliases: - needed_aliases[aliasname] = devname + if aliasname not in needed_aliases: + needed_aliases[aliasname] = devname # determine envlist if aliasnames: # only the first item of aliasnames is added to the envlist @@ -588,12 +585,12 @@ class FrappyConfig(Device): # determine aliases to be changed for aliasname, dev in previous_aliases.items(): - target = needed_aliases.get(aliasname) - if target: - if dev.alias == target: - needed_aliases.pop(aliasname) - else: - needed_aliases[aliasname] = None + target = needed_aliases.get(aliasname) + if target: + if dev.alias == target: + needed_aliases.pop(aliasname) + else: + needed_aliases[aliasname] = None # build new env list. keep order as before addedenv = [v for v in newenv.values()]