x/python-ganttclient
Code Issues Proposed changes

Use 'root' instead of 'os' in XenAPI driver

Browse Source 
Instance types define disk names as root, swap and ephemeral. The
XenAPI driver however uses os, swap and ephemeral. Standardize on
calling them 'root' disks instead of 'os' disks.

Change-Id: Ia34346d463d06cb971537c305602926ceb0dc175
This commit is contained in:
Johannes Erdfelt
2012-04-09 15:34:19 +00:00
parent 3ae747b1fd
commit eaa280b4db
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/xenapi/stubs.py
View File

@@ -41,7 +41,7 @@ def stubout_firewall_driver(stubs, conn):
def stubout_instance_snapshot(stubs):
@classmethod
def fake_fetch_image(cls, context, session, instance, image, type):
return [dict(vdi_type='os', vdi_uuid=_make_fake_vdi())]
return [dict(vdi_type='root', vdi_uuid=_make_fake_vdi())]
stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image)
@@ -192,7 +192,7 @@ class FakeSessionForVMTests(fake.SessionBase):
def host_call_plugin(self, _1, _2, plugin, method, _5):
if (plugin, method) == ('glance', 'download_vhd'):
return fake.as_json(dict(vdi_type='os',
return fake.as_json(dict(vdi_type='root',
vdi_uuid=_make_fake_vdi()))
elif (plugin, method) == ("xenhost", "iptables_config"):
return fake.as_json(out=self._fake_iptables_save_output,
@@ -203,7 +203,7 @@ class FakeSessionForVMTests(fake.SessionBase):
def host_call_plugin_swap(self, _1, _2, plugin, method, _5):
if (plugin, method) == ('glance', 'download_vhd'):
return fake.as_json(dict(vdi_type='os',
return fake.as_json(dict(vdi_type='root',
vdi_uuid=_make_fake_vdi()),
dict(vdi_type='swap',
vdi_uuid=_make_fake_vdi()))