zuul
/
nodepool
Code Issues Proposed changes

Merge "builder: remove unused from_images_dir interface"

This commit is contained in:
Zuul 2022-02-01 22:15:03 +00:00 committed by Gerrit Code Review
parent cbfe1d636b da8780526a
commit e2e66f5b42
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/builder.py
View File

@ -85,10 +85,6 @@ class DibImageFile(object):
images.append(image)
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):
my_path = Path(images_dir) / self.image_id
if with_extension:

17
nodepool/tests/unit/test_builder.py
View File

@ -69,23 +69,6 @@ class TestNodepoolBuilderDibImage(tests.BaseTestCase):
self.assertEqual(images[0].extension, 'qcow2')
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):
image = builder.DibImageFile('myid1234', 'qcow2')
self.assertEqual(image.to_path('/imagedir'),