samba-tool sites: Re-add support for option groups
authorAmitay Isaacs <amitay@gmail.com>
Tue, 7 Feb 2012 06:30:22 +0000 (17:30 +1100)
committerAmitay Isaacs <amitay@samba.org>
Wed, 8 Feb 2012 01:27:28 +0000 (02:27 +0100)
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Feb  8 02:27:28 CET 2012 on sn-devel-104

source4/scripting/python/samba/netcmd/sites.py

index f5223db5f86916a8a94c1949403a62c6a10f09cb..5cbc09c1051f7fe4642e15f49d15aac44441591b 100644 (file)
@@ -24,6 +24,7 @@
 import os
 from samba import sites
 from samba.samdb import SamDB
+import samba.getopt as options
 from samba.auth import system_session
 from samba.netcmd import (
     Command,
@@ -39,6 +40,12 @@ class cmd_sites_create(Command):
 
     takes_args = ["sitename"]
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
     def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)
@@ -66,6 +73,12 @@ class cmd_sites_delete(Command):
 
     takes_args = ["sitename"]
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
     def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)