x/python-ganttclient
Code Issues Proposed changes

Merge "PXE driver should not accept empty kernel UUID."

Browse Source
This commit is contained in:
Jenkins
2013-01-21 22:57:37 +00:00
committed by Gerrit Code Review
parent 0b1cf16183 cbbbb5d779
commit 6a66881280
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nova/tests/baremetal/test_pxe.py
View File

@@ -248,6 +248,13 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase):
pxe.get_tftp_image_info, pxe.get_tftp_image_info,
self.instance) self.instance)
# Test that other non-true values also raise an exception
CONF.baremetal.deploy_kernel = ""
CONF.baremetal.deploy_ramdisk = ""
self.assertRaises(exception.NovaException,
pxe.get_tftp_image_info,
self.instance)
# Even if the instance includes kernel_id and ramdisk_id, # Even if the instance includes kernel_id and ramdisk_id,
# we still need deploy_kernel_id and deploy_ramdisk_id. # we still need deploy_kernel_id and deploy_ramdisk_id.
# If those aren't present in instance[], and not specified in # If those aren't present in instance[], and not specified in
@@ -289,6 +296,17 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase):
self.assertEqual(res['deploy_kernel'][0], 'eeee') self.assertEqual(res['deploy_kernel'][0], 'eeee')
self.assertEqual(res['deploy_ramdisk'][0], 'ffff') self.assertEqual(res['deploy_ramdisk'][0], 'ffff')
# However, if invalid values are passed on the image extra_specs,
# this should still raise an exception.
extra_specs = {
'deploy_kernel_id': '',
'deploy_ramdisk_id': '',
}
self.instance['extra_specs'] = extra_specs
self.assertRaises(exception.NovaException,
pxe.get_tftp_image_info,
self.instance)
class PXEPrivateMethodsTestCase(BareMetalPXETestCase): class PXEPrivateMethodsTestCase(BareMetalPXETestCase):