openstack
/
nova
Code Issues Proposed changes

Merge "Add missing argument max_size in libvirt driver" into stable/havana

This commit is contained in:
Jenkins 2013-12-02 16:10:29 +00:00 committed by Gerrit Code Review
parent 8a99344387 b3af6e877a
commit 8affa07dc2
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nova/tests/virt/libvirt/test_libvirt.py
View File

@ -3659,6 +3659,23 @@ class LibvirtConnTestCase(test.TestCase):
]
self.assertEquals(gotFiles, wantFiles)
def test_create_ephemeral_default(self):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('mkfs.ext3', '-L', 'myVol', '-F',
'/dev/something', run_as_root=True)
self.mox.ReplayAll()
conn._create_ephemeral('/dev/something', 20, 'myVol', 'linux',
max_size=20)
def test_create_swap_default(self):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('mkswap', '/dev/something')
self.mox.ReplayAll()
conn._create_swap('/dev/something', 1, max_size=20)
def test_get_console_output_file(self):
fake_libvirt_utils.files['console.log'] = '01234567890'

5
nova/virt/libvirt/driver.py
View File

@ -2253,12 +2253,13 @@ class LibvirtDriver(driver.ComputeDriver):
if fs_format:
utils.mkfs(fs_format, target, label)
def _create_ephemeral(self, target, ephemeral_size, fs_label, os_type):
def _create_ephemeral(self, target, ephemeral_size, fs_label, os_type,
max_size=None):
self._create_local(target, ephemeral_size)
disk.mkfs(os_type, fs_label, target)
@staticmethod
def _create_swap(target, swap_mb):
def _create_swap(target, swap_mb, max_size=None):
"""Create a swap file of specified size."""
libvirt_utils.create_image('raw', target, '%dM' % swap_mb)
utils.mkfs('swap', target)