sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

upgradeprovision: Change test to always use 2008 R2 schema

Browse Source 
This tool (and the corresponding test) is designed to migrate a Samba DC
from a pre-4.0.0 release up to a more recent schema (i.e. Windows 2008R2).

Going further than 2008R2 turns this test into a bit of a nightmare. We
now have a better adprep/'samba-tool domain schemaupgrade' option for
upgrading from 2008R2 to a more recent schema.

It seems to make most sense to leave this tests just running against
2008R2 schema provisions and add new tests to migrate from 2008R2 to
2012R2.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Tim Beale 2017-10-05 10:01:27 +13:00 committed by Andrew Bartlett
parent ea9cde92fb
commit c22d022cea
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/upgradehelpers.py
View File

@ -226,7 +226,7 @@ def update_policyids(names, samdb):
names.policyid_dc = None
def newprovision(names, session, smbconf, provdir, logger):
def newprovision(names, session, smbconf, provdir, logger, base_schema=None):
"""Create a new provision.
This provision will be the reference for knowing what has changed in the
@ -256,7 +256,7 @@ def newprovision(names, session, smbconf, provdir, logger):
backend_type=None, ldapadminpass=None, ol_mmr_urls=None,
slapd_path=None,
dom_for_fun_level=names.domainlevel, dns_backend=names.dns_backend,
useeadb=True, use_ntvfs=True)
useeadb=True, use_ntvfs=True, base_schema=base_schema)
def dn_sort(x, y):

2
source4/scripting/bin/samba_upgradeprovision
View File

@ -1633,7 +1633,7 @@ if __name__ == '__main__':
provisiondir = tempfile.mkdtemp(dir=paths.private_dir,
prefix="referenceprovision")
result = newprovision(names, session, smbconf, provisiondir,
provision_logger)
provision_logger, base_schema="2008_R2")
result.report_logger(provision_logger)
# TODO

2
testprogs/blackbox/upgradeprovision-oldrelease.sh
View File

@ -95,7 +95,7 @@ samba_upgradedns() {
}
referenceprovision() {
$PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003
$PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2
}
ldapcmp() {