openstack
/
cinder
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-09-05 00:01:49 +00:00 committed by Gerrit Code Review
parent 6f3bec3c64 709278abdf
commit 4c7a358b30
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/drivers/netapp/dataontap/block_cmode.py
View File

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

4
cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
View File

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

3
cinder/volume/drivers/netapp/dataontap/utils/capabilities.py
View File

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

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

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