Merge "builder: remove unused from_images_dir interface"
This commit is contained in:
commit
e2e66f5b42
|
@ -85,10 +85,6 @@ class DibImageFile(object):
|
||||||
images.append(image)
|
images.append(image)
|
||||||
return images
|
return images
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def from_images_dir(images_dir):
|
|
||||||
return [DibImageFile.from_path(x) for x in Path(images_dir).iterdir()]
|
|
||||||
|
|
||||||
def to_path(self, images_dir, with_extension=True):
|
def to_path(self, images_dir, with_extension=True):
|
||||||
my_path = Path(images_dir) / self.image_id
|
my_path = Path(images_dir) / self.image_id
|
||||||
if with_extension:
|
if with_extension:
|
||||||
|
|
|
@ -69,23 +69,6 @@ class TestNodepoolBuilderDibImage(tests.BaseTestCase):
|
||||||
self.assertEqual(images[0].extension, 'qcow2')
|
self.assertEqual(images[0].extension, 'qcow2')
|
||||||
self.assertEqual(images[1].extension, 'raw')
|
self.assertEqual(images[1].extension, 'raw')
|
||||||
|
|
||||||
def test_from_images_dir(self):
|
|
||||||
tempdir = fixtures.TempDir()
|
|
||||||
self.useFixture(tempdir)
|
|
||||||
image_path_1 = os.path.join(tempdir.path, 'myid1234.qcow2')
|
|
||||||
image_path_2 = os.path.join(tempdir.path, 'myid1234.raw')
|
|
||||||
open(image_path_1, 'w')
|
|
||||||
open(image_path_2, 'w')
|
|
||||||
|
|
||||||
images = builder.DibImageFile.from_images_dir(tempdir.path)
|
|
||||||
images = sorted(images, key=lambda x: x.extension)
|
|
||||||
self.assertEqual(len(images), 2)
|
|
||||||
|
|
||||||
self.assertEqual(images[0].image_id, 'myid1234')
|
|
||||||
self.assertEqual(images[0].extension, 'qcow2')
|
|
||||||
self.assertEqual(images[1].image_id, 'myid1234')
|
|
||||||
self.assertEqual(images[1].extension, 'raw')
|
|
||||||
|
|
||||||
def test_to_path(self):
|
def test_to_path(self):
|
||||||
image = builder.DibImageFile('myid1234', 'qcow2')
|
image = builder.DibImageFile('myid1234', 'qcow2')
|
||||||
self.assertEqual(image.to_path('/imagedir'),
|
self.assertEqual(image.to_path('/imagedir'),
|
||||||
|
|
Loading…
Reference in New Issue