get rid of all the fancy parameter packing and checking and just keep

things simple.

also implemented vol.status

1 files changed, 5 insertions, 13 deletions

diff --git a/func/minion/modules/netapp/snap.py b/func/minion/modules/netapp/snap.py
index 08987b1..db94911 100644
--- a/func/minion/modules/netapp/snap.py
+++ b/func/minion/modules/netapp/snap.py
@@ -23,33 +23,25 @@ class Snap(func_module.FuncModule):
     api_version = "0.0.1"
     description = "Interface to the 'snap' command"
 
-    def create(self, filer, args):
+    def create(self, filer, vol, snap):
         """
         TODO: Document me ...
         """
         regex = """creating snapshot..."""
-        param_check(args, ['volname', 'snapname'])
-        
-        cmd_opts = ['snap', 'create']
-        cmd_opts.extend([args['volname'], args['snapname']])
-
+        cmd_opts = ['snap', 'create', vol, snap]
         output = ssh(filer, cmd_opts)
         return check_output(regex, output)
 
-    def delete(self, filer, args):
+    def delete(self, filer, args, vol, snap):
         """
         TODO: Document me ...
         """
         regex = """deleting snapshot..."""
-        param_check(args, ['volname', 'snapname'])
-        
-        cmd_opts = ['snap', 'delete']
-        cmd_opts.extend([args['volname'], args['snapname']])
-
+        cmd_opts = ['snap', 'delete', vol, snap]
         output = ssh(filer, cmd_opts)
         return check_output(regex, output)
     
-    def list(self, filer, args):
+    def list(self, filer, vol):
         """
         TODO: Document me ...
         """