From 44bf72785d2de83702955975d2fe60cba19f2b94 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 30 Nov 2022 06:49:17 -0800 Subject: [PATCH] Remove unecessary function There was only one caller to the change_node_state function, and it was the one-line hold function. Remove the unecessary indirection. Change-Id: I13efc73edf807c8cb6b430f207bf7cb067520ba3 --- nodepool/cmd/nodepoolcmd.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py index 0265c2c97..5ae1216e8 100644 --- a/nodepool/cmd/nodepoolcmd.py +++ b/nodepool/cmd/nodepoolcmd.py @@ -310,7 +310,7 @@ class NodePoolCmd(NodepoolApp): self.list(node_id=node.id) - def _change_node_state(self, new_state): + def hold(self): node = self.zk.getNode(self.args.id) if not node: print("Node id %s not found" % self.args.id) @@ -318,15 +318,12 @@ class NodePoolCmd(NodepoolApp): self.zk.lockNode(node, blocking=True, timeout=5) - node.state = new_state + node.state = zk.HOLD self.zk.storeNode(node) self.zk.unlockNode(node) self.list(node_id=node.id) - def hold(self): - self._change_node_state(zk.HOLD) - def dib_image_delete(self): (image, build_num) = self.args.id.rsplit('-', 1) build = self.zk.getBuild(image, build_num)