commit 180fed1afa9f916004f03a7b5042075644057f65
author David Kranz <david.kranz@qrclab.com> Tue Mar 27 14:31:29 2012 -0400
committer David Kranz <david.kranz@qrclab.com> Mon Apr 02 09:43:39 2012 -0400
tree 813cb9fe5f965a370018ac3e832ec0cc87ccb805
parent 3f981df854cb55679b883713165262d7c37e45c0

Fix and simplify reboot stress test. Add new env stuff.

Added stress environment var for max_instances.
Added tempest var for log_level of rest_client.

Change-Id: Ia92536a547cdab4d2496bd9ba9067be3595b79cd

xxxxx

Change-Id: I8c2f499a41f74c2fe6fb08c80ab6fc31f6b93426

stress/driver.py

diff --git a/stress/driver.py b/stress/driver.py
index b68825e..e8c8f12 100644
--- a/stress/driver.py
+++ b/stress/driver.py
@@ -114,14 +114,14 @@
                                    (default: 32)

                     `seed`       = random seed (default: None)

     """

+    stress_config = StressConfig(manager.config._conf)

     # get keyword arguments

     duration = kwargs.get('duration', datetime.timedelta(seconds=10))

     seed = kwargs.get('seed', None)

     sleep_time = float(kwargs.get('sleep_time', 3000)) / 1000

-    max_vms = int(kwargs.get('max_vms', 32))

+    max_vms = int(kwargs.get('max_vms', stress_config.max_instances))

     test_name = kwargs.get('test_name', 'unamed test')

 

-    stress_config = StressConfig(manager.config._conf)

     keypath = stress_config.host_private_key_path

     user = stress_config.host_admin_user

     logdir = stress_config.nova_logdir

@@ -194,7 +194,8 @@
                 break

             i += 1

             if i > 60:

-                raise

+                _error_in_logs(keypath, logdir, user, computes)

+                raise Exception("Cleanup timed out")

             time.sleep(1)

         logging.info('killed %s' % kill_id)

         state.delete_instance_state(kill_id)