diff --git a/nova/virt/zvm/volumeop.py b/nova/virt/zvm/volumeop.py index 68c59927..b67dad15 100644 --- a/nova/virt/zvm/volumeop.py +++ b/nova/virt/zvm/volumeop.py @@ -14,6 +14,7 @@ import contextlib import re +import six import time from oslo_config import cfg @@ -713,7 +714,7 @@ def _extract_connection_info(self, context, connection_info): self._format_fcp_list(fcp_list)) def _format_wwpn(self, wwpn): - if isinstance(wwpn, basestring): + if isinstance(wwpn, six.string_types): return wwpn.lower() else: new_wwpn = ';'.join(wwpn)