Browse Source

Merge "NetApp ONTAP: Fix JSON serialization error on EMS logs" into stable/stein

changes/73/680473/1
Zuul 2 weeks ago
parent
commit
4c7a358b30

+ 3
- 1
cinder/volume/drivers/netapp/dataontap/block_cmode.py View File

@@ -432,7 +432,9 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary,
432 432
 
433 433
     def _get_backing_flexvol_names(self):
434 434
         """Returns a list of backing flexvol names."""
435
-        return self.ssc_library.get_ssc().keys()
435
+
436
+        ssc = self.ssc_library.get_ssc()
437
+        return list(ssc.keys())
436 438
 
437 439
     def create_group(self, group):
438 440
         """Driver entry point for creating a generic volume group.

+ 3
- 1
cinder/volume/drivers/netapp/dataontap/nfs_cmode.py View File

@@ -687,7 +687,9 @@ class NetAppCmodeNfsDriver(nfs_base.NetAppNfsDriver,
687 687
 
688 688
     def _get_backing_flexvol_names(self):
689 689
         """Returns a list of backing flexvol names."""
690
-        return self.ssc_library.get_ssc().keys()
690
+
691
+        ssc = self.ssc_library.get_ssc()
692
+        return list(ssc.keys())
691 693
 
692 694
     def _get_flexvol_names_from_hosts(self, hosts):
693 695
         """Returns a set of flexvol names."""

+ 2
- 1
cinder/volume/drivers/netapp/dataontap/utils/capabilities.py View File

@@ -99,8 +99,9 @@ class CapabilitiesLibrary(object):
99 99
 
100 100
     def get_ssc_flexvol_names(self):
101 101
         """Get the names of the FlexVols in the Storage Service Catalog."""
102
+
102 103
         ssc = self.get_ssc()
103
-        return ssc.keys()
104
+        return list(ssc.keys())
104 105
 
105 106
     def get_ssc_for_flexvol(self, flexvol_name):
106 107
         """Get map of Storage Service Catalog entries for a single flexvol."""

+ 5
- 0
releasenotes/notes/bug-1833115-fix-netapp-ontap-python3-failures-dd869e602f9539e1.yaml View File

@@ -0,0 +1,5 @@
1
+---
2
+fixes:
3
+  - |
4
+    Fix python 3 incompatibility issues preventing NetApp cDOT driver from
5
+    generating EMS logging messages (Bug #1833115).

Loading…
Cancel
Save