commit 30fe84adbd2176f8201fba968f6959e8cc441ba1
author David Kranz <david.kranz@qrclab.com> Tue Mar 20 16:25:47 2012 -0400
committer David Kranz <david.kranz@qrclab.com> Wed Mar 21 12:50:21 2012 -0400
tree 7cd935484564f1bfc0394bc958b3ea3c3aeed7b5
parent e7c423e8a257dc0ed47f8e6a3d87f7076c018c0e

Generalize configuration for controller access.

Add comment about libvirt resize.

Fix stress bug.

Change-Id: Ieb751abd24fb7a5bc4747550c465541ab2fbfc9e

stress/test_servers.py

diff --git a/stress/test_servers.py b/stress/test_servers.py
index 3f62ac3..47d30b5 100644
--- a/stress/test_servers.py
+++ b/stress/test_servers.py
@@ -57,7 +57,8 @@
             return None
 
         _key_name = kwargs.get('key_name', '')
-        _timeout = int(kwargs.get('timeout', 60))
+        _timeout = int(kwargs.get('timeout',
+                                  manager.config.compute.build_timeout))
         _image_ref = kwargs.get('image_ref', manager.config.compute.image_ref)
         _flavor_ref = kwargs.get('flavor_ref',
                                  manager.config.compute.flavor_ref)
@@ -172,7 +173,7 @@
             self._logger.info('no ACTIVE instances to delete')
             return
 
-        _timeout = kwargs.get('timeout', 600)
+        _timeout = kwargs.get('timeout', manager.config.compute.build_timeout)
 
         target = random.choice(active_vms)
         killtarget = target[0]
@@ -240,7 +241,7 @@
             self._logger.info('no active instances to delete')
             return
 
-        _timeout = kwargs.get('timeout', 60)
+        _timeout = kwargs.get('timeout', manager.config.compute.build_timeout)
 
         target = random.choice(vms)
         killtarget = target[0]
@@ -276,7 +277,7 @@
             self._logger.info('no active instances to update')
             return
 
-        _timeout = kwargs.get('timeout', 600)
+        _timeout = kwargs.get('timeout', manager.config.compute.build_timeout)
 
         target = random.choice(active_vms)
         update_target = target[0]