samba-tool: moved takes_optiongroups definition to Command base class

The option groups should be defined at the Command base class level as they are in common across all samba-tool commands.
Major move advantages:
1. more OOP approach
2. enforcing consistency across commands
3. avoiding the need of declaring for every new command

Signed-off-by: Andrew Tridgell <tridge@samba.org>

1 files changed, 1 insertions, 17 deletions

diff --git a/source4/scripting/python/samba/netcmd/spn.py b/source4/scripting/python/samba/netcmd/spn.py
index 4cfa21fa03f..e81cdce4f30 100644
--- a/source4/scripting/python/samba/netcmd/spn.py
+++ b/source4/scripting/python/samba/netcmd/spn.py
@@ -3,6 +3,7 @@
 # spn management
 #
 # Copyright Matthieu Patou mat@samba.org 2010
+# Copyright Giampaolo Lauria 2011 <lauria2@yahoo.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -56,12 +57,6 @@ class cmd_spn_list(Command):
     """List spns of a given user."""
     synopsis = "%prog spn list <user>"
 
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
     takes_args = ["user"]
 
     def run(self, user, credopts=None, sambaopts=None, versionopts=None):
@@ -95,11 +90,6 @@ class cmd_spn_add(Command):
     """Create a new spn."""
     synopsis = "%prog spn add [--force] <name> <user>"
 
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
     takes_options = [
         Option("--force", help="Force the addition of the spn"\
                                " even it exists already", action="store_true"),
@@ -153,12 +143,6 @@ class cmd_spn_delete(Command):
     """Delete a spn."""
     synopsis = "%prog spn delete <name> [user]"
 
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
     takes_args = ["name", "user?"]
 
     def run(self, name, user=None, credopts=None, sambaopts=None, versionopts=None):