x/python-ganttclient
Code Issues Proposed changes

Move imagecache code from nova.virt.libvirt.utils

Browse Source 
The imagecache related code in libvirt.utils uses the base_dir_name
config option.

If we move the imagecache utils into imagecache, then we can move
the base_dir_name option into that module since there are no other
users of it.

Having all the imagecache code in the imagecache module seems like
a sensible thing to do anyway.

blueprint: scope-config-opts
Change-Id: I1e154aa4de1628d40964207bdcbe5b3b55076442
This commit is contained in:
Mark McLoughlin
2012-11-21 22:44:32 +00:00
parent 92329a00d0
commit 008875048c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nova/tests/test_imagecache.py
View File

@@ -65,7 +65,7 @@ class ImageCacheManagerTestCase(test.TestCase):
csum_input = '{"sha1": "fdghkfhkgjjksfdgjksjkghsdf"}\n' csum_input = '{"sha1": "fdghkfhkgjjksfdgjksjkghsdf"}\n'
fname = os.path.join(tmpdir, 'aaa') fname = os.path.join(tmpdir, 'aaa')
info_fname = virtutils.get_info_filename(fname) info_fname = imagecache.get_info_filename(fname)
f = open(info_fname, 'w') f = open(info_fname, 'w')
f.write(csum_input) f.write(csum_input)
f.close() f.close()
@@ -91,7 +91,8 @@ class ImageCacheManagerTestCase(test.TestCase):
timestamped=False) timestamped=False)
self.assertEquals(csum_output, 'fdghkfhkgjjksfdgjksjkghsdf') self.assertEquals(csum_output, 'fdghkfhkgjjksfdgjksjkghsdf')
self.assertFalse(os.path.exists(old_fname)) self.assertFalse(os.path.exists(old_fname))
self.assertTrue(os.path.exists(virtutils.get_info_filename(fname))) info_fname = imagecache.get_info_filename(fname)
self.assertTrue(os.path.exists(info_fname))
def test_list_base_images(self): def test_list_base_images(self):
listing = ['00000001', listing = ['00000001',
@@ -352,7 +353,7 @@ class ImageCacheManagerTestCase(test.TestCase):
'operating system.') 'operating system.')
fname = os.path.join(tmpdir, 'aaa') fname = os.path.join(tmpdir, 'aaa')
info_fname = virtutils.get_info_filename(fname) info_fname = imagecache.get_info_filename(fname)
with open(fname, 'w') as f: with open(fname, 'w') as f:
f.write(testdata) f.write(testdata)
@@ -525,7 +526,7 @@ class ImageCacheManagerTestCase(test.TestCase):
with self._make_base_file() as fname: with self._make_base_file() as fname:
image_cache_manager = imagecache.ImageCacheManager() image_cache_manager = imagecache.ImageCacheManager()
image_cache_manager._remove_base_file(fname) image_cache_manager._remove_base_file(fname)
info_fname = virtutils.get_info_filename(fname) info_fname = imagecache.get_info_filename(fname)
# Files are initially too new to delete # Files are initially too new to delete
self.assertTrue(os.path.exists(fname)) self.assertTrue(os.path.exists(fname))
@@ -543,7 +544,7 @@ class ImageCacheManagerTestCase(test.TestCase):
image_cache_manager = imagecache.ImageCacheManager() image_cache_manager = imagecache.ImageCacheManager()
image_cache_manager.originals = [fname] image_cache_manager.originals = [fname]
image_cache_manager._remove_base_file(fname) image_cache_manager._remove_base_file(fname)
info_fname = virtutils.get_info_filename(fname) info_fname = imagecache.get_info_filename(fname)
# Files are initially too new to delete # Files are initially too new to delete
self.assertTrue(os.path.exists(fname)) self.assertTrue(os.path.exists(fname))
@@ -873,12 +874,13 @@ class ImageCacheManagerTestCase(test.TestCase):
'%(image)s.info')) '%(image)s.info'))
base_filename = os.path.join(CONF.instances_path, '_base', hashed) base_filename = os.path.join(CONF.instances_path, '_base', hashed)
self.assertFalse(virtutils.is_valid_info_file('banana')) is_valid_info_file = imagecache.is_valid_info_file
self.assertFalse(virtutils.is_valid_info_file( self.assertFalse(is_valid_info_file('banana'))
self.assertFalse(is_valid_info_file(
os.path.join(CONF.instances_path, '_base', '00000001'))) os.path.join(CONF.instances_path, '_base', '00000001')))
self.assertFalse(virtutils.is_valid_info_file(base_filename)) self.assertFalse(is_valid_info_file(base_filename))
self.assertFalse(virtutils.is_valid_info_file(base_filename + '.sha1')) self.assertFalse(is_valid_info_file(base_filename + '.sha1'))
self.assertTrue(virtutils.is_valid_info_file(base_filename + '.info')) self.assertTrue(is_valid_info_file(base_filename + '.info'))
def test_configured_checksum_path(self): def test_configured_checksum_path(self):
with utils.tempdir() as tmpdir: with utils.tempdir() as tmpdir:

1
nova/tests/test_libvirt.py
View File

@@ -73,6 +73,7 @@ CONF = cfg.CONF
CONF.import_opt('compute_manager', 'nova.config') CONF.import_opt('compute_manager', 'nova.config')
CONF.import_opt('host', 'nova.config') CONF.import_opt('host', 'nova.config')
CONF.import_opt('my_ip', 'nova.config') CONF.import_opt('my_ip', 'nova.config')
CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
_fake_network_info = fake_network.fake_get_instance_nw_info _fake_network_info = fake_network.fake_get_instance_nw_info