merge trunk, fixed unittests, added i18n strings, cleanups etc etc.

2010-12-23 03:35:41 +00:00
parent e8a700dbc5 0428538a48
commit 474eeb5d3d
24 changed files with 429 additions and 193 deletions
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -51,6 +51,8 @@ class FakeSessionForVMTests(fake.SessionBase):
            raise fake.Failure(['VM_BAD_POWER_STATE', ref, 'Halted',
                                  vm['power_state']])
        vm['power_state'] = 'Running'
+        vm['is_a_template'] = False
+        vm['is_control_domain'] = False


 class FakeSessionForVolumeTests(fake.SessionBase):