From 047f972866f5979517e34fc1f292155d25d81efc Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 10 Mar 2015 17:09:09 -0700 Subject: [PATCH] Remove duplicate code Make testing easier by removing a copy of a method from the provider_manager. Instead import this method from nodeutils. Change-Id: I68addb82826c2ce5ee89e120d5f1958fde4f7f12 --- nodepool/nodeutils.py | 6 +++++- nodepool/provider_manager.py | 13 +------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nodepool/nodeutils.py b/nodepool/nodeutils.py index 2434f6a6f..3f1555c6b 100644 --- a/nodepool/nodeutils.py +++ b/nodepool/nodeutils.py @@ -28,13 +28,17 @@ import paramiko log = logging.getLogger("nodepool.utils") +ITERATE_INTERVAL = 2 # How long to sleep while waiting for something + # in a loop + + def iterate_timeout(max_seconds, purpose): start = time.time() count = 0 while (time.time() < start + max_seconds): count += 1 yield count - time.sleep(2) + time.sleep(ITERATE_INTERVAL) raise Exception("Timeout waiting for %s" % purpose) diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py index fd130fabb..8fcc421c8 100644 --- a/nodepool/provider_manager.py +++ b/nodepool/provider_manager.py @@ -29,23 +29,12 @@ import keystoneclient.v2_0.client as ksclient import time import fakeprovider +from nodeutils import iterate_timeout from task_manager import Task, TaskManager, ManagerStoppedException SERVER_LIST_AGE = 5 # How long to keep a cached copy of the server list IPS_LIST_AGE = 5 # How long to keep a cached copy of the ip list -ITERATE_INTERVAL = 2 # How long to sleep while waiting for something - # in a loop - - -def iterate_timeout(max_seconds, purpose): - start = time.time() - count = 0 - while (time.time() < start + max_seconds): - count += 1 - yield count - time.sleep(ITERATE_INTERVAL) - raise Exception("Timeout waiting for %s" % purpose) def get_public_ip(server, version=4):