Merge pull request #367 from martin-belanger/v2.2.2

trid: Fix migration of old TID object (introspect self._cfg member)
linux-nvme · Jun 7, 2023 · fd07276 · fd07276
2 parents 435248b + 13497e6
commit fd07276
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,11 @@
 # STorage Appliance Services (STAS)
 
+## Changes with release 2.2.2
+
+Bug fixes:
+
+* Fix migration of old "last known config" to new format. Old TID objects did not contain a `_cfg` member. Therefore, one needs to check for its existence (through introspection) before blindly trying to access it.
+
 ## Changes with release 2.2.1
 
 Added a few more unit and coverage tests. Fixed the following bugs.

diff --git a/meson.build b/meson.build
@@ -9,7 +9,7 @@
 project(
     'nvme-stas',
     meson_version: '>= 0.53.0',
-    version: '2.2.1',
+    version: '2.2.2',
     license: 'Apache-2.0',
     default_options: [
         'buildtype=release',

diff --git a/staslib/trid.py b/staslib/trid.py
@@ -106,7 +106,12 @@ def as_dict(self):
             'host-traddr': self.host_traddr,
             'host-iface': self.host_iface,
         }
-        data.update(self._cfg)
+
+        # When migrating an old last known config, the "_cfg" member may
+        # not exist. Therefor retrive it with getattr() to avoid a crash.
+        cfg = getattr(self, '_cfg', None)
+        if cfg:
+            data.update(cfg)
         return data
 
     def __str__(self):