openstack/ironic
Code Issues Proposed changes

Merge "Follow up patch for 39e40ef12b016a1aeb37a3fe755b9978d3f9934f"

Browse Source
This commit is contained in:
Jenkins 2015-11-17 11:14:14 +00:00 committed by Gerrit Code Review
commit 5624ce2b42
3 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ironic/tests/unit/drivers/modules/ilo/test_boot.py
View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
"""Test class for common methods used by iLO modules."""
"""Test class for boot methods used by iLO modules."""
import tempfile
@ -48,6 +48,26 @@ INFO_DICT = db_utils.get_test_ilo_info()
CONF = cfg.CONF
class IloBootCommonMethodsTestCase(db_base.DbTestCase):
def setUp(self):
super(IloBootCommonMethodsTestCase, self).setUp()
mgr_utils.mock_the_extension_manager(driver="iscsi_ilo")
self.node = obj_utils.create_test_node(
self.context, driver='iscsi_ilo', driver_info=INFO_DICT)
def test_parse_driver_info(self):
self.node.driver_info['ilo_deploy_iso'] = 'deploy-iso'
expected_driver_info = {'ilo_deploy_iso': 'deploy-iso'}
actual_driver_info = ilo_boot.parse_driver_info(self.node)
self.assertEqual(expected_driver_info, actual_driver_info)
def test_parse_driver_info_exc(self):
self.assertRaises(exception.MissingParameterValue,
ilo_boot.parse_driver_info, self.node)
class IloBootPrivateMethodsTestCase(db_base.DbTestCase):
def setUp(self):
@ -480,17 +500,27 @@ class IloVirtualMediaBootTestCase(db_base.DbTestCase):
spec_set=True, autospec=True)
def test_clean_up_instance(self, cleanup_iso_mock,
cleanup_vmedia_mock):
CONF.ilo.use_web_server_for_images = False
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
driver_internal_info = task.node.driver_internal_info
driver_internal_info['boot_iso_created_in_web_server'] = False
driver_internal_info['root_uuid_or_disk_id'] = (
"12312642-09d3-467f-8e09-12385826a123")
task.node.driver_internal_info = driver_internal_info
task.node.save()
task.driver.boot.clean_up_instance(task)
cleanup_iso_mock.assert_called_once_with(task.node)
cleanup_vmedia_mock.assert_called_once_with(task)
driver_internal_info = task.node.driver_internal_info
boot_iso_created = driver_internal_info.get(
'boot_iso_created_in_web_server')
root_uuid = driver_internal_info.get('root_uuid_or_disk_id')
self.assertIsNone(boot_iso_created)
self.assertIsNone(root_uuid)
@mock.patch.object(ilo_common, 'cleanup_vmedia_boot', spec_set=True,
autospec=True)
def test_clean_up_ramdisk(self, cleanup_vmedia_mock):
CONF.ilo.use_web_server_for_images = False
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
task.driver.boot.clean_up_ramdisk(task)
@ -529,12 +559,13 @@ class IloVirtualMediaBootTestCase(db_base.DbTestCase):
def test_prepare_instance_partition_image(
self, cleanup_vmedia_boot_mock,
configure_vmedia_mock):
self.node.driver_internal_info = {'root_uuid_or_disk_id': "some_uuid"}
self.node.driver_internal_info = {'root_uuid_or_disk_id': (
"12312642-09d3-467f-8e09-12385826a123")}
self.node.save()
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
task.driver.boot.prepare_instance(task)
cleanup_vmedia_boot_mock.assert_called_once_with(task)
configure_vmedia_mock.assert_called_once_with(mock.ANY, task,
"some_uuid")
configure_vmedia_mock.assert_called_once_with(
mock.ANY, task, "12312642-09d3-467f-8e09-12385826a123")

12
ironic/tests/unit/drivers/modules/ilo/test_common.py
View File

@ -746,9 +746,9 @@ class IloCommonMethodsTestCase(db_base.DbTestCase):
autospec=True)
@mock.patch.object(ilo_common, 'set_secure_boot_mode', spec_set=True,
autospec=True)
def test__update_secure_boot_mode_passed_true(self,
func_set_secure_boot_mode,
func_is_secure_boot_req):
def test_update_secure_boot_mode_passed_true(self,
func_set_secure_boot_mode,
func_is_secure_boot_req):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
func_is_secure_boot_req.return_value = True
@ -759,9 +759,9 @@ class IloCommonMethodsTestCase(db_base.DbTestCase):
autospec=True)
@mock.patch.object(ilo_common, 'set_secure_boot_mode', spec_set=True,
autospec=True)
def test__update_secure_boot_mode_passed_false(self,
func_set_secure_boot_mode,
func_is_secure_boot_req):
def test_update_secure_boot_mode_passed_false(self,
func_set_secure_boot_mode,
func_is_secure_boot_req):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
func_is_secure_boot_req.return_value = False

7
ironic/tests/unit/drivers/modules/ilo/test_vendor.py
View File

@ -13,11 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
"""Test class for common methods used by iLO modules."""
"""Test class for vendor methods used by iLO modules."""
import mock
from oslo_config import cfg
import six
from ironic.common import exception
from ironic.common import states
@ -34,10 +33,6 @@ from ironic.tests.unit.db import utils as db_utils
from ironic.tests.unit.objects import utils as obj_utils
if six.PY3:
import io
file = io.BytesIO
INFO_DICT = db_utils.get_test_ilo_info()
CONF = cfg.CONF