Merge pull request #7737 from toddmowen/zfs-fix-7696

zfs: fix incompatibility - share.nfs vs sharenfs (issue #7696)

system/zfs

@@ -310,14 +310,19 @@ class Zfs(object):
                     self.set_property(prop, value) 
 
     def get_current_properties(self):
-        cmd = [self.module.get_bin_path('zfs', True)]
+        def get_properties_by_name(propname):
-        cmd.append('get -H all')
+            cmd = [self.module.get_bin_path('zfs', True)]
-        cmd.append(self.name)
+            cmd += ['get', '-H', propname, self.name]
-        rc, out, err = self.module.run_command(' '.join(cmd))
+            rc, out, err = self.module.run_command(cmd)
-        properties = dict()
+            return [l.split('\t')[1:3] for l in out.splitlines()]
-        for l in out.splitlines():
+        properties = dict(get_properties_by_name('all'))
-            p, v = l.split('\t')[1:3]
+        if 'share.*' in properties:
-            properties[p] = v
+            # Some ZFS pools list the sharenfs and sharesmb properties
+            # hierarchically as share.nfs and share.smb respectively.
+            del properties['share.*']
+            for p, v in get_properties_by_name('share.all'):
+                alias = p.replace('.', '')  # share.nfs -> sharenfs (etc)
+                properties[alias] = v
         return properties
 
     def run_command(self, cmd):