From: Michael Fritch Date: Tue, 13 Oct 2020 00:56:34 +0000 (-0600) Subject: mgr/orchestrator: set `lsm_data` to default of Dict type X-Git-Tag: v15.2.8~14^2~17 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1de6d2987716c1dfe400582d6ffe373f750ea4c2;p=ceph.git mgr/orchestrator: set `lsm_data` to default of Dict type similar to handling of `sys_api`, convert a NoneType to a Dict Fixes: https://tracker.ceph.com/issues/47841 Signed-off-by: Michael Fritch (cherry picked from commit 39512f9f9aa8ad6f0dab31e249ff563003c0befe) --- diff --git a/src/python-common/ceph/deployment/inventory.py b/src/python-common/ceph/deployment/inventory.py index eb9852426c4..e2409c932e9 100644 --- a/src/python-common/ceph/deployment/inventory.py +++ b/src/python-common/ceph/deployment/inventory.py @@ -51,7 +51,7 @@ class Device(object): rejected_reasons=None, # type: Optional[List[str]] lvs=None, # type: Optional[List[str]] device_id=None, # type: Optional[str] - lsm_data={}, # type: Dict[str, Dict[str, str]] + lsm_data=None, # type: Optional[Dict[str, Dict[str, str]]] ): self.path = path self.sys_api = sys_api if sys_api is not None else {} # type: Dict[str, Any] @@ -59,7 +59,7 @@ class Device(object): self.rejected_reasons = rejected_reasons if rejected_reasons is not None else [] self.lvs = lvs self.device_id = device_id - self.lsm_data = lsm_data + self.lsm_data = lsm_data if lsm_data is not None else {} # type: Dict[str, Dict[str, str]] def to_json(self): # type: () -> dict