Restructing redfish resource test files

This commit restructures the test files in
redfish/resources.
Also renaming the function 'get_member_from_device'
to 'get_member_device' in redfish virtual media
resource.

Change-Id: I6365d72c5f9f43747120c28b9dcef81a03cad4da
This commit is contained in:
Aparna 2017-07-12 09:42:23 +00:00
parent 1ab6b07eb5
commit 7488ae2048
8 changed files with 6 additions and 6 deletions

View File

@ -349,7 +349,7 @@ class RedfishOperations(operations.IloOperations):
manager = self._get_sushy_manager(PROLIANT_MANAGER_ID)
try:
vmedia_device = (
manager.virtual_media.get_member_from_device(
manager.virtual_media.get_member_device(
VIRTUAL_MEDIA_MAP[device]))
if not vmedia_device.inserted:
LOG.debug(self._("No media available in the device '%s' to "
@ -379,7 +379,7 @@ class RedfishOperations(operations.IloOperations):
manager = self._get_sushy_manager(PROLIANT_MANAGER_ID)
try:
vmedia_device = (
manager.virtual_media.get_member_from_device(
manager.virtual_media.get_member_device(
VIRTUAL_MEDIA_MAP[device]))
if vmedia_device.inserted:
vmedia_device.eject_vmedia()
@ -425,7 +425,7 @@ class RedfishOperations(operations.IloOperations):
manager = self._get_sushy_manager(PROLIANT_MANAGER_ID)
try:
vmedia_device = (
manager.virtual_media.get_member_from_device(
manager.virtual_media.get_member_device(
VIRTUAL_MEDIA_MAP[device]))
vmedia_device.set_vm_status(BOOT_OPTION_MAP[boot_option])
except sushy.exceptions.SushyError as e:

View File

@ -111,7 +111,7 @@ class VirtualMediaCollection(base.ResourceCollectionBase):
def _resource_type(self):
return VirtualMedia
def get_member_from_device(self, device):
def get_member_device(self, device):
"""Returns the given virtual media device object.
:param device: virtual media device to be queried

View File

@ -39,13 +39,13 @@ class VirtualMediaCollectionTestCase(testtools.TestCase):
self.conn, '/redfish/v1/Managers/1/VirtualMedia',
redfish_version='1.0.2')
def test_get_member_from_device(self):
def test_get_member_device(self):
with open('proliantutils/tests/redfish/'
'json_samples/vmedia.json', 'r') as f:
self.conn.get.return_value.json.return_value = (
json.loads(f.read())['default'])
obj = self.vmedia_coll_inst.get_member_from_device(
obj = self.vmedia_coll_inst.get_member_device(
constants.VIRTUAL_MEDIA_CD)
self.assertIsInstance(obj, virtual_media.VirtualMedia)