x/python-ganttclient
Code Issues Proposed changes

Fixes LP688545.

Browse Source
This commit is contained in:
Josh Kearney
2011-01-03 23:49:48 +00:00
committed by Tarmac
parent 48a5cc2437 5aba86baff
commit 4d03d56cf8
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/flags.py
View File

@@ -266,6 +266,8 @@ DEFINE_string('sql_connection',
DEFINE_string('sql_idle_timeout', DEFINE_string('sql_idle_timeout',
'3600', '3600',
'timeout for idle sql database connections') 'timeout for idle sql database connections')
DEFINE_integer('sql_max_retries', 12, 'sql connection attempts')
DEFINE_integer('sql_retry_interval', 10, 'sql connection retry interval')
DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager', DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager',
'Manager for compute') 'Manager for compute')

7
nova/tests/test_xenapi.py
View File

@@ -250,15 +250,16 @@ class XenAPIVMTestCase(test.TestCase):
def _create_instance(self): def _create_instance(self):
"""Creates and spawns a test instance""" """Creates and spawns a test instance"""
values = {'name': 1, 'id': 1, values = {
'name': 1,
'id': 1,
'project_id': self.project.id, 'project_id': self.project.id,
'user_id': self.user.id, 'user_id': self.user.id,
'image_id': 1, 'image_id': 1,
'kernel_id': 2, 'kernel_id': 2,
'ramdisk_id': 3, 'ramdisk_id': 3,
'instance_type': 'm1.large', 'instance_type': 'm1.large',
'mac_address': 'aa:bb:cc:dd:ee:ff' 'mac_address': 'aa:bb:cc:dd:ee:ff'}
}
instance = db.instance_create(values) instance = db.instance_create(values)
self.conn.spawn(instance) self.conn.spawn(instance)
return instance return instance