Merge "Port remotefs driver to Python 3"

diff --cc cinder/volume/drivers/remotefs.py
index ee3191c91fba21fd142e875be108dc4276a34c6a,12b8f288eaaf4240a449765e71b24507843a2456..c3da55d6263034c9d541724d7a76d83bbcb66904
--- 1/cinder/volume/drivers/remotefs.py
--- 2/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):

diff --cc tox.ini
Simple merge