From: Thierry Parmentelat Date: Sat, 17 Sep 2011 07:52:58 +0000 (+0200) Subject: fix X-Git-Tag: tests-5.0-29~43 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d799f38c0a1d0c9d149f5bbf48a4d9b234ba1a03;p=tests.git fix --- diff --git a/system/Substrate.py b/system/Substrate.py index 2e54cba..013ca8f 100644 --- a/system/Substrate.py +++ b/system/Substrate.py @@ -136,9 +136,9 @@ class Pool: def next_free (self): for i in self.pool: - if i.status in ['busy','mine','starting' ]: continue - i.status='mine' - return (i.hostname,i.userdata) + if i.status == 'free': + i.status='mine' + return (i.hostname,i.userdata) raise Exception,"No IP address available in pool %s"%self.message # OS-dependent ping option (support for macos, for convenience) @@ -176,9 +176,9 @@ class Pool: except: items=[] for item in items: for i in self.pool: - if i.hostname==item: i.status='starting' + if i.hostname==item and i.status==None: i.status='starting' - def release_my_fakes (self): + def release_my_starting (self): for i in self.pool: if i.status=='mine': self.del_starting(i.hostname) @@ -763,8 +763,8 @@ class Substrate: #################### release: def release (self,options): - self.vplc_pool.release_my_fakes() - self.vnode_pool.release_my_fakes() + self.vplc_pool.release_my_starting() + self.vnode_pool.release_my_starting() pass #################### show results for interactive mode