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

s4-sites: Document, fix under optimal coding, use exceptions

Browse Source 
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Wed Nov  2 22:35:00 CET 2011 on sn-devel-104
This commit is contained in:
Matthieu Patou
2011-11-02 20:24:20 +01:00
committed by Matthieu Patou
parent 23d3880725
commit 2db221c384
3 changed files with 104 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source4/scripting/python/samba/netcmd/sites.py
View File

@ -23,7 +23,7 @@
import os
from samba import sites
from samba import Ldb
from samba.samdb import SamDB
from samba.auth import system_session
from samba.netcmd import (
Command,
@ -42,20 +42,20 @@ class cmd_sites_create(Command):
def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
name = "sam.ldb"
path = lp.get("private dir")
url = os.path.join(path, name)
url = lp.private_path("sam.ldb")
if not os.path.exists(url):
raise CommandError("secret database not found at %s " % url)
samdb = Ldb(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb.transaction_start()
ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
if not ok:
raise CommandError("Error while creating site %s" % sitename)
try:
ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
except sites.SiteAlreadyExistsException, e:
samdb.transaction_cancel()
raise CommandError("Error while creating site %s, error: %s" % (sitename, str(e)))
self.outf.write("Site %s created !\n" % sitename)
@ -69,20 +69,20 @@ class cmd_sites_delete(Command):
def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
name = "sam.ldb"
path = lp.get("private dir")
url = os.path.join(path, name)
url = lp.private_path("sam.ldb")
if not os.path.exists(url):
raise CommandError("secret database not found at %s " % url)
samdb = Ldb(url=url, session_info=system_session(),
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp)
samdb.transaction_start()
ok = sites.delete_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
if not ok:
raise CommandError("Error while creating site %s" % sitename)
try:
ok = sites.delete_site(samdb, samdb.get_config_basedn(), sitename)
samdb.transaction_commit()
except sites.SiteException, e:
samdb.transaction_cancel()
raise CommandError("Error while removing site %s, error: %s" % (sitename, str(e)))
self.outf.write("Site %s removed!\n" % sitename)

68
source4/scripting/python/samba/sites.py
View File

@ -22,11 +22,59 @@
import ldb
from ldb import FLAG_MOD_ADD
class SiteException(Exception):
"""Base element for Sites errors"""
def __init__(self, value):
self.value = value
def __str__(self):
return "SiteException: " + self.value
class SiteNotFoundException(SiteException):
"""Raised when the site is not found and it's expected to exists."""
def __init__(self, value):
self.value = value
def __str__(self):
return "SiteNotFoundException: " + self.value
class SiteAlreadyExistsException(SiteException):
"""Raised when the site is not found and it's expected not to exists."""
def __init__(self, value):
self.value = value
def __str__(self):
return "SiteAlreadyExists: " + self.value
class SiteServerNotEmptyException(SiteException):
"""Raised when the site still has servers attached."""
def __init__(self, value):
self.value = value
def __str__(self):
return "SiteServerNotEmpty: " + self.value
def create_site(samdb, configDn, siteName):
"""
Create a site
:param samdb: A samdb connection
:param configDn: The DN of the configuration partition
:param siteName: Name of the site to create
:return: True upon success
:raise SiteAlreadyExists: if the site to be created already exists.
"""
ret = samdb.search(base=configDn, scope=ldb.SCOPE_SUBTREE,
expression='(&(objectclass=Site)(cn=%s))' % siteName)
if len(ret) != 0:
raise Exception('A site with the name %s already exists' % siteName)
raise SiteAlreadyExistsException('A site with the name %s already exists' % siteName)
m = ldb.Message()
m.dn = ldb.Dn(samdb, "Cn=%s,CN=Sites,%s" % (siteName, str(configDn)))
@ -49,14 +97,30 @@ def create_site(samdb, configDn, siteName):
return True
def delete_site(samdb, configDn, siteName):
"""
Delete a site
:param samdb: A samdb connection
:param configDn: The DN of the configuration partition
:param siteName: Name of the site to delete
:return: True upon success
:raise SiteNotFoundException: if the site to be deleted do not exists.
:raise SiteServerNotEmpty: if the site has still servers in it.
"""
dnsites = ldb.Dn(samdb, "CN=Sites,%s" % (str(configDn)))
dnsite = ldb.Dn(samdb, "Cn=%s,CN=Sites,%s" % (siteName, str(configDn)))
dnserver = ldb.Dn(samdb, "Cn=Servers,%s" % str(dnsite))
ret = samdb.search(base=dnsites, scope=ldb.SCOPE_ONELEVEL,
expression='(dn=%s)' % str(dnsite))
if len(ret) != 1:
raise SiteNotFoundException('Site %s do not exists' % siteName)
ret = samdb.search(base=dnserver, scope=ldb.SCOPE_ONELEVEL,
expression='(objectclass=server)')
if len(ret) != 0:
raise Exception('Site %s still has servers in it, move them before removal' % siteName)
raise SiteServerNotEmptyException('Site %s still has servers in it, move them before removal' % siteName)
samdb.delete(dnsite, ["tree_delete:0"])