merge trunk

This commit is contained in:
Cory Wright
2011-01-03 10:09:58 -05:00
2 changed files with 6 additions and 1 deletions

View File

@@ -6,6 +6,7 @@ keys
networks networks
nova.sqlite nova.sqlite
CA/cacert.pem CA/cacert.pem
CA/crl.pem
CA/index.txt* CA/index.txt*
CA/openssl.cnf CA/openssl.cnf
CA/serial* CA/serial*

View File

@@ -166,6 +166,10 @@ class XenAPIVMTestCase(test.TestCase):
instances = self.conn.list_instances() instances = self.conn.list_instances()
self.assertEquals(instances, []) self.assertEquals(instances, [])
def test_get_diagnostics(self):
instance = self._create_instance()
self.conn.get_diagnostics(instance)
def test_instance_snapshot(self): def test_instance_snapshot(self):
stubs.stubout_instance_snapshot(self.stubs) stubs.stubout_instance_snapshot(self.stubs)
instance = self._create_instance() instance = self._create_instance()
@@ -253,7 +257,7 @@ class XenAPIVMTestCase(test.TestCase):
'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)