mgr/orchestrator: fix some minor typos/kinks in inventory/service cache

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 2a8536265d08ff68b135a5d665651594056e24e9)

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 216127b18b502a1cd752c88f4918494bf3b80e96..ccf2c86fd71ef97a739a02a49b843e147ab2d7da 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -878,7 +878,7 @@ class InventoryNode(object):
     @classmethod
     def from_nested_items(cls, hosts):
         devs = InventoryDevice.from_ceph_volume_inventory_list
-        return [cls(item[0], devs(item[1])) for item in hosts]
+        return [cls(item[0], devs(item[1].data)) for item in hosts]
 
 
 def _mk_orch_methods(cls):
@@ -1003,7 +1003,7 @@ class OutdatableData(object):
             timestr = None
 
         return {
-            "data": self.data,
+            "data": self._data,
             "last_refresh": timestr,
         }
 
@@ -1037,7 +1037,7 @@ class OutdatableData(object):
         return self.last_refresh < cutoff
 
     def __repr__(self):
-        return 'OutdatableData(data={}, last_refresh={})'.format(self.data, self.last_refresh)
+        return 'OutdatableData(data={}, last_refresh={})'.format(self._data, self.last_refresh)
 
 
 class OutdatableDictMixin(object):
@@ -1063,13 +1063,13 @@ class OutdatableDictMixin(object):
 
     def items_filtered(self, keys=None):
         if keys:
-            return [(host, self[keys]) for host in keys]
+            return [(host, self[host]) for host in keys]
         else:
             return list(self.items())
 
     def any_outdated(self, timeout=None):
         items = self.items()
-        if not items:
+        if not list(items):
             return True
         return any([i[1].outdated(timeout) for i in items])