Merge "Filtering type extra-spec support to ZFSSA drivers"

diff --cc cinder/tests/unit/test_zfssa.py
index a2981b99cf6caadbda2b346f79def560fa84ffa4,8ce54e449303b509caf9097b3ce5d7197e28b0fc..daa050c93028fb61378f67a53ea04dc98dc01fec
--- 1/cinder/tests/unit/test_zfssa.py
--- 2/cinder/tests/unit/test_zfssa.py
+++ b/cinder/tests/unit/test_zfssa.py
@@@ -775,8 -779,11 +788,9 @@@ class TestZFSSANFSDriver(test.TestCase)
          self.configuration.zfssa_nfs_share_compression = nfs_compression
          self.configuration.zfssa_nfs_mount_options = ''
          self.configuration.zfssa_rest_timeout = '30'
 -        self.configuration.nfs_oversub_ratio = 1
 -        self.configuration.nfs_used_ratio = 1
          self.configuration.zfssa_enable_local_cache = True
          self.configuration.zfssa_cache_directory = zfssa_cache_dir
+         self.configuration.nfs_sparsed_volumes = 'true'
  
      def test_migrate_volume(self):
          self.drv.zfssa.get_asn.return_value = (

diff --cc cinder/volume/drivers/zfssa/zfssaiscsi.py
Simple merge

diff --cc cinder/volume/drivers/zfssa/zfssanfs.py
Simple merge

diff --cc cinder/volume/drivers/zfssa/zfssarest.py
Simple merge