zuul/nodepool
Code Issues Proposed changes

Remove duplicate code

Browse Source 
Make testing easier by removing a copy of a method from the
provider_manager. Instead import this method from nodeutils.

Change-Id: I68addb82826c2ce5ee89e120d5f1958fde4f7f12
This commit is contained in:
Clark Boylan 2015-03-10 17:09:09 -07:00
parent 9d07cbf974
commit 047f972866
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodepool/nodeutils.py
View File

@ -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)

13
nodepool/provider_manager.py
View File

@ -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):