sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4/drs-tests: Split samba-tool command line generation into separate method

Browse Source 
so we can use to exec samba-tool passing different commands
This commit is contained in:
Kamen Mazdrashki 2011-02-18 04:09:45 +02:00
parent 75856d53cb
commit 288e20cfb7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/torture/drs/python/drs_base.py
View File

@ -88,17 +88,22 @@ class DrsBaseTestCase(samba.tests.BlackboxTestCase):
def _make_obj_name(self, prefix):
return prefix + time.strftime("%s", time.gmtime())
def _net_drs_replicate(self, DC, fromDC, nc_dn=None):
if nc_dn is None:
nc_dn = self.domain_dn
def _samba_tool_cmdline(self, drs_command):
# find out where is net command
samba_tool_cmd = os.path.abspath("./bin/samba-tool")
# make command line credentials string
creds = self.get_credentials()
cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(),
creds.get_username(), creds.get_password())
cmdline_auth = "-U%s/%s%%%s" % (creds.get_domain(),
creds.get_username(), creds.get_password())
# bin/samba-tool drs <drs_command> <cmdline_auth>
return "%s drs %s %s" % (samba_tool_cmd, drs_command, cmdline_auth)
def _net_drs_replicate(self, DC, fromDC, nc_dn=None):
if nc_dn is None:
nc_dn = self.domain_dn
# make base command line
samba_tool_cmdline = self._samba_tool_cmdline("replicate")
# bin/samba-tool drs replicate <Dest_DC_NAME> <Src_DC_NAME> <Naming Context>
cmd_line = "%s drs replicate %s %s %s %s" % (samba_tool_cmd, DC, fromDC,
nc_dn, cmd_line_auth)
cmd_line = "%s %s %s %s" % (samba_tool_cmdline, DC, fromDC, nc_dn)
self.check_run(cmd_line)