openstack
/
fuel-web
Code Issues Proposed changes

Delete data about images after env removal 

Adds removing yaml with data about target images
after environment removal

Change-Id: Id676658a0cb08237e099b7c22ba5b416c57c13a9
Closes-Bug: #1492243
This commit is contained in:
Oleksandr Minakov 2016-01-26 15:28:49 +02:00 committed by Bulat Gaifullin
parent 2534d21280
commit 73ab06a5a9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nailgun/nailgun/task/task.py
View File

@ -581,15 +581,19 @@ class DeletionTask(object):
class DeleteIBPImagesTask(object):
@classmethod
def message(cls, task, image_data):
def message(cls, task, images_data):
files = []
for image in six.itervalues(image_data):
files.append(
os.path.join(
settings.PROVISIONING_IMAGES_PATH,
os.path.basename(
six.moves.urllib.parse.urlsplit(image['uri']).path))
for image_path, image_data in six.iteritems(images_data):
file_name = os.path.basename(
six.moves.urllib.parse.urlsplit(image_data['uri']).path)
files.append(os.path.join(
settings.PROVISIONING_IMAGES_PATH, file_name)
)
if image_path == '/':
yaml_name = '{0}.{1}'.format(file_name.split('.')[0], 'yaml')
files.append(os.path.join(
settings.PROVISIONING_IMAGES_PATH, yaml_name))
task_params = {
'parameters': {
'cmd': 'rm -f {0}'.format(' '.join(files)),

1
nailgun/nailgun/test/unit/test_task.py
View File

@ -127,6 +127,7 @@ class TestDeleteIBPImagesTask(BaseTestCase):
self.assertTrue(rm_cmd.startswith('rm -f'))
self.assertIn('/fake/path/fake-boot.img', rm_cmd)
self.assertIn('/fake/path/fake.img', rm_cmd)
self.assertIn('/fake/path/fake.yaml', rm_cmd)
class TestHelperUpdateClusterStatus(BaseTestCase):