sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-14 12:59:07 +03:00
Code Activity

uptodateness: migrate get_kcc_and_dsas as a function

Browse Source 
We need to reuse it in drs cmd.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13658
This commit is contained in:
Joe Guo
2018-10-04 00:42:08 +13:00
committed by Andrew Bartlett
parent 90975eb088
commit 74f7080b15
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python/samba/netcmd/visualize.py
View File

@ -47,6 +47,7 @@ from samba.uptodateness import (
get_utdv_edges,
get_utdv_distances,
get_utdv_max_distance,
get_kcc_and_dsas,
)
COMMON_OPTIONS = [
@ -100,19 +101,6 @@ class GraphCommand(Command):
samdb = SamDB(url=H, credentials=creds, lp=lp)
return samdb
def get_kcc_and_dsas(self, H, lp, creds):
"""Get a readonly KCC object and the list of DSAs it knows about."""
unix_now = int(time.time())
kcc = KCC(unix_now, readonly=True)
kcc.load_samdb(H, lp, creds)
dsa_list = kcc.list_dsas()
dsas = set(dsa_list)
if len(dsas) != len(dsa_list):
print("There seem to be duplicate dsas", file=sys.stderr)
return kcc, dsas
def write(self, s, fn=None, suffix='.dot'):
"""Decide whether we're dealing with a filename, a tempfile, or
stdout, and write accordingly.
@ -233,7 +221,7 @@ class cmd_reps(GraphCommand):
# replication graph.
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
local_kcc, dsas = self.get_kcc_and_dsas(H, lp, creds)
local_kcc, dsas = get_kcc_and_dsas(H, lp, creds)
unix_now = local_kcc.unix_now
partition = get_partition(local_kcc.samdb, partition)
@ -442,7 +430,7 @@ class cmd_ntdsconn(GraphCommand):
creds = None
H = self.import_ldif_db(importldif, lp)
local_kcc, dsas = self.get_kcc_and_dsas(H, lp, creds)
local_kcc, dsas = get_kcc_and_dsas(H, lp, creds)
local_dsa_dn = local_kcc.my_dsa_dnstr.split(',', 1)[1]
vertices = set()
attested_edges = []
@ -678,7 +666,7 @@ class cmd_uptodateness(GraphCommand):
# replication graph.
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
local_kcc, dsas = self.get_kcc_and_dsas(H, lp, creds)
local_kcc, dsas = get_kcc_and_dsas(H, lp, creds)
self.samdb = local_kcc.samdb
partition = get_partition(self.samdb, partition)