openstack
/
sushy-tools
Code Issues Proposed changes

Fix defaults to storage and drive resources 

If storage and/or drive resource emulation is not set up
via sushy emulator configuration, some sane defaults must
be used. Otherwise the clients trying to read either of
these resources hit hard HTTP 500 response.

Change-Id: I1118e4a98278a517ae2a9c80873886a6bb6520f1
This commit is contained in:
Ilya Etingof 2019-10-09 13:28:33 +02:00
parent 538d98dd1e
commit 9d8709930f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/fix-storage-drive-defaults-3a925a0063738b77.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes defaults to storage and drive resources. Prior to this fix,
if storage and/or drive resource emulation is not set up via sushy
emulator configuration, the clients trying to read either of
these resources would hit hard HTTP 500 response.

4
sushy_tools/emulator/resources/drives/staticdriver.py
View File

@ -28,7 +28,7 @@ class StaticDriver(DriverBase):
@classmethod
def initialize(cls, config):
cls._config = config
cls._drives = cls._config.get('SUSHY_EMULATOR_DRIVES')
cls._drives = cls._config.get('SUSHY_EMULATOR_DRIVES', {})
return cls
@property
@ -60,5 +60,5 @@ class StaticDriver(DriverBase):
:returns: list of tuples representing the drives
"""
return [k + (d['Id'],) for k in self._drives.keys()
return [k + (d['Id'],) for k in self._drives
for d in self._drives[k]]

4
sushy_tools/emulator/resources/storage/staticdriver.py
View File

@ -28,7 +28,7 @@ class StaticDriver(DriverBase):
@classmethod
def initialize(cls, config):
cls._config = config
cls._storage = cls._config.get('SUSHY_EMULATOR_STORAGE')
cls._storage = cls._config.get('SUSHY_EMULATOR_STORAGE', {})
return cls
@property
@ -60,5 +60,5 @@ class StaticDriver(DriverBase):
:returns: list of tuples representing the storage instances
"""
return [(k, st["Id"]) for k in self._storage.keys()
return [(k, st["Id"]) for k in self._storage
for st in self._storage[k]]