Attachment #7741 for bug #41556

View | Details | Raw Unified | Return to bug 41556
Collapse All | Expand All




def shadow(lo, module, object, position):
	'''if object is a container, return object and module the container
	shadows (that is usually the one that is subordinate in the LDAP tree)'''

	if not object:
		return (None, None)
	dn=object.dn

	else:
		return None

def arg(object):
	if hasattr(object, 'arg'):
		return object.arg
	else:
		return None

def ocToType(oc):
	for module in univention.admin.modules.modules.values():
		if univention.admin.modules.policyOc(module) == oc:

def fixedAttribute(object, key):
	if not hasattr(object, 'fixedAttributes'):
		return 0

	return object.fixedAttributes().get(key, 0)

def emptyAttribute(object, key):
	if not hasattr(object, 'emptyAttributes'):
		return 0

	return object.emptyAttributes().get(key, 0)

def getPolicyReference(object, policy_type):

		return

	removePolicyReference(object, policy_type)

	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'replacePolicyReference: appending reference: %s' % new_reference)
	object.policies.append(new_reference)


	module=univention.admin.modules.get(policy_type)
	if not module:
		return

	removePolicyReference(object, policy_type)

	restore=None

	object_module=univention.admin.modules.get(object_module)
	if hasattr(object_module, 'docleanup'):
		wantsCleanup=object_module.docleanup

	return wantsCleanup

def performCleanup(object):

(-)a/branches/ucs-4.1/ucs-4.1-2/management/univention-directory-manager-modules/modules/univention/admincli/admin.py (-1 lines)

Lines 992-998 def _doit(arglist):	Link Here

992

		try:

992

		try:

993

			for object in univention.admin.modules.lookup(module, co, lo, scope='sub', superordinate=superordinate, base=position.getDn(), filter=filter):

993

			for object in univention.admin.modules.lookup(module, co, lo, scope='sub', superordinate=superordinate, base=position.getDn(), filter=filter):

994

				out.append( 'DN: %s' % _2utf8( univention.admin.objects.dn (object ) ) )

994

				out.append( 'DN: %s' % _2utf8( univention.admin.objects.dn (object ) ) )

995

				out.append( 'ARG: %s' % univention.admin.objects.arg( object ) )

996

995

997

				if (hasattr(module,'virtual') and not module.virtual) or not hasattr(module,'virtual'):

996

				if (hasattr(module,'virtual') and not module.virtual) or not hasattr(module,'virtual'):

998

					object.open()

997

					object.open()




		self.__initOptions(options)
		self.ldap = self.__initAccess()
		self.__superordinate = None
		self.__arg = None

	def __getDefaultBinddn(self):
		return self.rdn('cn=admin')

			return result[0]
		return None, None

	def arg(self, argument = None):
		'''Set or query the current objects "arg".

		Set "arg" to "Argument", if given, otherwise just return it.

		Some objects are not stored in their own LDAP object but are
		attached to an existing object.  To identify such an object,
		both the DN and the "arg" are needed.
		'''
		if argument is None:
			return self.__arg
		self.__arg = argument
		return self.__arg

	def superordinate(self, argument = None):
		'''Set or query the current objectts "superordinate".


			sup = getattr(argument, 'superordinate')
		if callable(sup):
			sup = sup()
		kwargs = { 'base': dn, 'scope': 'base', 'superordinate': sup }
		res = supmod.lookup(self.__config, self.ldap, '', **kwargs)
		self.__superordinate = res[0]
		return self.__superordinate

			self.__command.append('--superordinate')
			self.__command.append(self.__escape(superordinate))

		def arg(self, arg):
			'''Set the "arg" argument.'''
			self.__command.append('--arg')
			self.__command.append(self.__escape(arg))

		def dn(self, dn):
			'''Set the "dn" argument.'''
			self.__command.append('--dn')

		# set superordinate if present
		if self.__superordinate:
			cmd.superordinate(self.__superordinate.dn)
		# set arg if present
		if self.__arg:
			cmd.arg(self.__arg)
		return cmd




# <http://www.gnu.org/licenses/>.


from BaseTest import BaseCase, TestError


class ObjectNotFoundError(TestError):

			% (test.name, helper, test.modname)
		TestError.__init__(self, error, test)


class LeftoverObjectFound(TestError):
	'''Assertion error in the Univention Admin test suite.


			% (test.name, helper, test.modname)
		TestError.__init__(self, error, test)


class ObjectNotIdentifiedError(TestError):
	'''Assertion error in the Univention Admin test suite.


			% (test.name, dn, test.modname)
		TestError.__init__(self, error, test)


class PropertyInvalidError(TestError):
	'''Assertion error in the Univention Admin test suite.


		e1 = 'Incorrect property %s (%s)' % (property, description)
		e2 = 'of object %s at DN %s (module %s).' \
		     % (test.name, dn, test.modname)
		e3 = 'Expected: "%s" Actual: "%s"' % (expected, actual)
		error = '%s %s %s' % (e1, e2, e3)
		TestError.__init__(self, error, test)


class ObjectClassNotPresentError(TestError):
	'''Assertion error in the Univention Admin test suite.


		     % (option, description)
		e2 = 'of object %s at DN %s (module %s).' \
		     % (test.name, dn, test.modname)
		e3 = 'Expected: "%s" Actual: "%s"' % (expected, actual)
		error = '%s %s %s' % (e1, e2, e3)
		TestError.__init__(self, error, test)


		# NOTE: this filter might be a little fragile...
		cmd.filter('%s="%s"' % (self.identifier, self.name))

	def __setupCommandUpdate(self, cmd, name, properties, options=None):
		descriptions = self.module.property_descriptions
		special = set(('position',))
		single = (
			p for p in properties
			if p not in special
			if not descriptions[p].multivalue)
		multi = (
			p for p in properties
			if p not in special
			if descriptions[p].multivalue)
		# set identifying property
		if name is not None:
			cmd.set(self.identifier, name)

		self.dn = dn
		self.__leftover_dns.add(dn)

	def testObjectExists(self, dn=None):
		'''Check that the object exists.

		"DN", if given, indicates the DN of the object to test.

		Raise "ObjectNotFoundError" if it does not exists.
		'''
		dn, attr = self.search(dn=dn)
		if attr is None:
			raise ObjectNotFoundError(self, dn)
		self.useDN(dn)

	def testObjectExistsNot(self, dn=None):
		'''Check that the object does not exists.

		"DN", if given, indicates the DN of the object to test.

		Raise "LeftoverObjectFound" if it does exists.
		'''
		dn, attr = self.search(dn=dn)
		if bool(attr):
			self.useDN(dn)
			raise LeftoverObjectFound(self, dn)

		Raise "ObjectNotIdentifiedError" if the module cannot identify
		the current object.
		'''
		_, attr = self.search(dn=self.dn)
		if not self.module.identify(self.dn, attr):
			raise ObjectNotIdentifiedError(self, self.dn)



		Raise "ObjectClassNotPresentError" if an option is not present.
		'''
		attr = self.ldap.get(dn=self.dn, attr=['objectClass'])
		for o in options:
			classes = self.module.options[o].objectClasses
			if not classes:

		values.
		'''
		special = set(('position',))
		props = (
			p for p in properties
			if p not in special
			if p not in self.uncheckedProperties)
		obj = self.open(dn=self.dn)
		for prop in props:
			self._testProperty(prop, obj, properties)

	def create(self, properties, options=None, name=None):
		'''Create an object of the current module.

		"Properties" is a mapping from property names to values.

		self.__setupCommandUpdate(cmd, name, properties, options)
		return cmd.run()

	def modify(self, properties, dn=None, name=None, newName=None):
		'''Modify an object of the current module.

		"Properties" is a mapping from property names to values;
		only values that should be changed need to be included.
		"DN", if given, is the DN of the object to modify.

		self.__setupCommandUpdate(cmd, newName, properties)
		return cmd.run()

	def remove(self, name=None, dn=None, recursive=False):
		'''Remove an object of the current module.

		"Name" is the name of the object to remove (defaults to the current objects name).
		"DN", if given, is the DN of the object to remove.
		"Recursive" should be True to remove the object recursively.

		if recursive:
			cmd.recursive()
		return cmd.run()

	def hookAfterCreated(self, dn):
		'''Perform additional actions after creating an object.



	def setUp(self):
		'''Hook method for setting up the test fixture before exercising it.

		Override this method to set up values for these properties:
		"name": The name of the object that will be tested.
			You most definitely want to set this one.

		self.createOptions = set()
		self.dn = None
		self.superordinate()
		self.arg()
		self.__leftover_dns = set()

	def runTest(self):

		is identified by the module and has the correct options and
		property values set.
		'''
		proc = self.create(self.createProperties, self.createOptions)
				   self.createOptions)
		self._checkProcess(proc, 'create')
		self.testObjectExists(self.dn)
		self.testObjectIdentify()

		exists, is identified by the module and has the correct property
		values set.
		'''
		proc = self.modify(self.modifyProperties, dn=self.dn)
		self._checkProcess(proc, 'modify')
		if self.newName is not None:
			self.dn = None

		This test removes the current object and then checks that it
		does not exist any more.
		'''
		proc = self.remove(dn=self.dn)
		self._checkProcess(proc, 'remove')
		self.testObjectExistsNot(self.dn)
		self.hookAfterRemoved(self.dn)

		When overriding this method, make sure you call to your superclass first!
		'''
		for dn in self.__leftover_dns:
			self.remove(dn=dn, recursive=True)

	def shortDescription(self):
		return 'testing module %s' % self.modname




			}
		self.dn = self.__zone.dn

	def hookAfterCreated(self, dn):
		self.arg(self.createProperties['mx'])

	def hookAfterModified(self, dn):
		self.arg(self.modifyProperties['mx'])

	# We cannot delete the record at the DN yet, so we can't check for
	# object non-existence by DN, so we need to override this method and
	# disable the check for object non-existence.




			}
		self.dn = self.__zone.dn

	def hookAfterCreated(self, dn):
		self.arg(self.createProperties['txt'])

	def hookAfterModified(self, dn):
		self.arg(self.modifyProperties['txt'])

	# We cannot delete the record at the DN yet, so we can't check for
	# object non-existence by DN, so we need to override this method and
	# disable the check for object non-existence.

Return to bug 41556