From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 10 Aug 2015 01:03:49 +0000 (+0000)
Subject: Merge "Port remotefs driver to Python 3"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dad3cf7a7784bf8769f1f3385eedd8d84c855921;p=openstack-build%2Fcinder-build.git

Merge "Port remotefs driver to Python 3"
---

dad3cf7a7784bf8769f1f3385eedd8d84c855921
diff --cc cinder/volume/drivers/remotefs.py
index ee3191c91,12b8f288e..c3da55d62
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@@ -765,10 -749,11 +768,12 @@@ class RemoteFSSnapDriver(RemoteFSDriver
          return output
  
      def _get_hash_str(self, base_str):
 -        """Return a string that represents hash of base_str
 -        (in a hex format).
 +        """Return a string that represents hash of base_str.
 +
 +        Returns string in a hex format.
          """
+         if isinstance(base_str, six.text_type):
+             base_str = base_str.encode('utf-8')
          return hashlib.md5(base_str).hexdigest()
  
      def _get_mount_point_for_share(self, share):