Use DN objects instead of strings

* Convert every string specifying a DN into a DN object

* Every place a dn was manipulated in some fashion it was replaced by
  the use of DN operators

* Add new DNParam parameter type for parameters which are DN's

* DN objects are used 100% of the time throughout the entire data
  pipeline whenever something is logically a dn.

* Many classes now enforce DN usage for their attributes which are
  dn's. This is implmented via ipautil.dn_attribute_property(). The
  only permitted types for a class attribute specified to be a DN are
  either None or a DN object.

* Require that every place a dn is used it must be a DN object.
  This translates into lot of::

    assert isinstance(dn, DN)

  sprinkled through out the code. Maintaining these asserts is
  valuable to preserve DN type enforcement. The asserts can be
  disabled in production.

  The goal of 100% DN usage 100% of the time has been realized, these
  asserts are meant to preserve that.

  The asserts also proved valuable in detecting functions which did
  not obey their function signatures, such as the baseldap pre and
  post callbacks.

* Moved ipalib.dn to ipapython.dn because DN class is shared with all
  components, not just the server which uses ipalib.

* All API's now accept DN's natively, no need to convert to str (or
  unicode).

* Removed ipalib.encoder and encode/decode decorators. Type conversion
  is now explicitly performed in each IPASimpleLDAPObject method which
  emulates a ldap.SimpleLDAPObject method.

* Entity & Entry classes now utilize DN's

* Removed __getattr__ in Entity & Entity clases. There were two
  problems with it. It presented synthetic Python object attributes
  based on the current LDAP data it contained. There is no way to
  validate synthetic attributes using code checkers, you can't search
  the code to find LDAP attribute accesses (because synthetic
  attriutes look like Python attributes instead of LDAP data) and
  error handling is circumscribed. Secondly __getattr__ was hiding
  Python internal methods which broke class semantics.

* Replace use of methods inherited from ldap.SimpleLDAPObject via
  IPAdmin class with IPAdmin methods. Directly using inherited methods
  was causing us to bypass IPA logic. Mostly this meant replacing the
  use of search_s() with getEntry() or getList(). Similarly direct
  access of the LDAP data in classes using IPAdmin were replaced with
  calls to getValue() or getValues().

* Objects returned by ldap2.find_entries() are now compatible with
  either the python-ldap access methodology or the Entity/Entry access
  methodology.

* All ldap operations now funnel through the common
  IPASimpleLDAPObject giving us a single location where we interface
  to python-ldap and perform conversions.

* The above 4 modifications means we've greatly reduced the
  proliferation of multiple inconsistent ways to perform LDAP
  operations. We are well on the way to having a single API in IPA for
  doing LDAP (a long range goal).

* All certificate subject bases are now DN's

* DN objects were enhanced thusly:
  - find, rfind, index, rindex, replace and insert methods were added
  - AVA, RDN and DN classes were refactored in immutable and mutable
    variants, the mutable variants are EditableAVA, EditableRDN and
    EditableDN. By default we use the immutable variants preserving
    important semantics. To edit a DN cast it to an EditableDN and
    cast it back to DN when done editing. These issues are fully
    described in other documentation.
  - first_key_match was removed
  - DN equalty comparison permits comparison to a basestring

* Fixed ldapupdate to work with DN's. This work included:
  - Enhance test_updates.py to do more checking after applying
    update. Add test for update_from_dict(). Convert code to use
    unittest classes.
  - Consolidated duplicate code.
  - Moved code which should have been in the class into the class.
  - Fix the handling of the 'deleteentry' update action. It's no longer
    necessary to supply fake attributes to make it work. Detect case
    where subsequent update applies a change to entry previously marked
    for deletetion. General clean-up and simplification of the
    'deleteentry' logic.
  - Rewrote a couple of functions to be clearer and more Pythonic.
  - Added documentation on the data structure being used.
  - Simplfy the use of update_from_dict()

* Removed all usage of get_schema() which was being called prior to
  accessing the .schema attribute of an object. If a class is using
  internal lazy loading as an optimization it's not right to require
  users of the interface to be aware of internal
  optimization's. schema is now a property and when the schema
  property is accessed it calls a private internal method to perform
  the lazy loading.

* Added SchemaCache class to cache the schema's from individual
  servers. This was done because of the observation we talk to
  different LDAP servers, each of which may have it's own
  schema. Previously we globally cached the schema from the first
  server we connected to and returned that schema in all contexts. The
  cache includes controls to invalidate it thus forcing a schema
  refresh.

* Schema caching is now senstive to the run time context. During
  install and upgrade the schema can change leading to errors due to
  out-of-date cached schema. The schema cache is refreshed in these
  contexts.

* We are aware of the LDAP syntax of all LDAP attributes. Every
  attribute returned from an LDAP operation is passed through a
  central table look-up based on it's LDAP syntax. The table key is
  the LDAP syntax it's value is a Python callable that returns a
  Python object matching the LDAP syntax. There are a handful of LDAP
  attributes whose syntax is historically incorrect
  (e.g. DistguishedNames that are defined as DirectoryStrings). The
  table driven conversion mechanism is augmented with a table of
  hard coded exceptions.

  Currently only the following conversions occur via the table:

  - dn's are converted to DN objects

  - binary objects are converted to Python str objects (IPA
    convention).

  - everything else is converted to unicode using UTF-8 decoding (IPA
    convention).

  However, now that the table driven conversion mechanism is in place
  it would be trivial to do things such as converting attributes
  which have LDAP integer syntax into a Python integer, etc.

* Expected values in the unit tests which are a DN no longer need to
  use lambda expressions to promote the returned value to a DN for
  equality comparison. The return value is automatically promoted to
  a DN. The lambda expressions have been removed making the code much
  simpler and easier to read.

* Add class level logging to a number of classes which did not support
  logging, less need for use of root_logger.

* Remove ipaserver/conn.py, it was unused.

* Consolidated duplicate code wherever it was found.

* Fixed many places that used string concatenation to form a new
  string rather than string formatting operators. This is necessary
  because string formatting converts it's arguments to a string prior
  to building the result string. You can't concatenate a string and a
  non-string.

* Simplify logic in rename_managed plugin. Use DN operators to edit
  dn's.

* The live version of ipa-ldap-updater did not generate a log file.
  The offline version did, now both do.

https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872

3 files changed, 1 insertions, 1235 deletions

diff --git a/tests/test_ipalib/test_dn.py b/tests/test_ipalib/test_dn.py
deleted file mode 100644
index 04e442f3f..000000000
--- a/tests/test_ipalib/test_dn.py
+++ /dev/null
@@ -1,1085 +0,0 @@
-#!/usr/bin/python
-
-import unittest
-from ipalib.dn import AVA, RDN, DN
-
-def default_rdn_attr_arg(i):
-    return 'a%d' % i
-
-def default_rdn_value_arg(i):
-    return str(i)
-
-def alt_rdn_attr_arg(i):
-    return 'b%d' % i
-
-def alt_rdn_value_arg(i):
-    return str(i*10)
-
-def make_rdn_args(low, high, kind, attr=None, value=None):
-    result=[]
-    for i in range(low, high):
-        if attr is None:
-            new_attr = default_rdn_attr_arg(i)
-        elif callable(attr):
-            new_attr = attr(i)
-        else:
-            new_attr = attr
-
-        if value is None:
-            new_value = default_rdn_value_arg(i)
-        elif callable(value):
-            new_value = value(i)
-        else:
-            new_value = value
-
-        if kind == 'tuple':
-            result.append((new_attr, new_value))
-        elif kind == 'list':
-            result.append([new_attr, new_value])
-        elif kind == 'RDN':
-            result.append(RDN((new_attr, new_value)))
-        else:
-            raise ValueError("Unknown kind = %s" % kind)
-
-    return result
-
-class TestAVA(unittest.TestCase):
-    def setUp(self):
-        self.attr1    = 'cn'
-        self.value1   = 'Bob'
-        self.str_ava1 = '%s=%s' % (self.attr1, self.value1)
-        self.ava1     = AVA(self.attr1, self.value1)
-
-    def test_create(self):
-        # Create with attr,value pair
-        ava1 = AVA(self.attr1, self.value1)
-        self.assertEqual(ava1, self.ava1)
-
-        # Create with "attr=value" string
-        ava1 = AVA(self.str_ava1)
-        self.assertEqual(ava1, self.ava1)
-
-        # Create with tuple (attr, value)
-        ava1 = AVA((self.attr1, self.value1))
-        self.assertEqual(ava1, self.ava1)
-
-        # Create with list [attr, value]
-        ava1 = AVA([self.attr1, self.value1])
-        self.assertEqual(ava1, self.ava1)
-
-        # Create with no args should fail
-        with self.assertRaises(TypeError):
-            AVA()
-
-        # Create with more than 2 args should fail
-        with self.assertRaises(TypeError):
-            AVA(self.attr1, self.value1, self.attr1)
-
-        # Create with 1 arg which is not string should fail
-        with self.assertRaises(TypeError):
-            AVA(1)
-
-        # Create with malformed AVA string should fail
-        with self.assertRaises(ValueError):
-            AVA("cn")
-
-        # Create with non-string parameters, should fail
-        with self.assertRaises(TypeError):
-            AVA(1, self.value1)
-
-        with self.assertRaises(TypeError):
-            AVA(self.attr1, 1)
-
-        with self.assertRaises(TypeError):
-            AVA((1, self.value1))
-
-        with self.assertRaises(TypeError):
-            AVA((self.attr1, 1))
-
-    def test_encoding(self):
-        # Create with attr,value pair
-        ava1 = AVA(self.attr1, self.value1)
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        ava1 = AVA(unicode(self.attr1), self.value1)
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        ava1 = AVA(self.attr1, unicode(self.value1))
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        # Create with "attr=value" string
-        ava1 = AVA(self.str_ava1)
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        ava1 = AVA(unicode(self.ava1))
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        # Create with tuple (attr, value)
-        ava1 = AVA((unicode(self.attr1), self.value1))
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-        ava1 = AVA((self.attr1, unicode(self.value1)))
-        self.assertEqual(ava1, self.ava1)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-
-    def test_indexing(self):
-        self.assertEqual(self.ava1[self.attr1], self.value1)
-
-        with self.assertRaises(KeyError):
-            self.ava1['foo']
-
-        with self.assertRaises(TypeError):
-            self.ava1[0]
-
-    def test_properties(self):
-        self.assertEqual(self.ava1.attr, self.attr1)
-        self.assertEqual(self.ava1.value, self.value1)
-
-    def test_str(self):
-        self.assertEqual(str(self.ava1), self.str_ava1)
-        self.assertIsInstance(str(self.ava1), str)
-
-    def test_cmp(self):
-        # Equality
-        ava1 = AVA(self.attr1, self.value1)
-
-        self.assertTrue(ava1 == self.ava1)
-        self.assertFalse(ava1 != self.ava1)
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 0)
-
-        # Upper case attr should still be equal
-        ava1 = AVA(self.attr1.upper(), self.value1)
-
-        self.assertFalse(ava1.attr == self.attr1)
-        self.assertTrue(ava1.value == self.value1)
-        self.assertTrue(ava1 == self.ava1)
-        self.assertFalse(ava1 != self.ava1)
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 0)
-
-        # Upper case value should still be equal
-        ava1 = AVA(self.attr1, self.value1.upper())
-
-        self.assertTrue(ava1.attr == self.attr1)
-        self.assertFalse(ava1.value == self.value1)
-        self.assertTrue(ava1 == self.ava1)
-        self.assertFalse(ava1 != self.ava1)
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 0)
-
-        # Make ava1's attr greater
-        ava1.attr = self.attr1 + "1"
-
-        self.assertFalse(ava1 == self.ava1)
-        self.assertTrue(ava1 != self.ava1)
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.ava1, ava1)
-        self.assertEqual(result, -1)
-
-        # Reset ava1's attr, should be equal again
-        ava1.attr = self.attr1
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 0)
-
-        # Make ava1's value greater
-        # attr will be equal, this tests secondary comparision component
-        ava1.value = self.value1 + "1"
-
-        result = cmp(ava1, self.ava1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.ava1, ava1)
-        self.assertEqual(result, -1)
-
-class TestRDN(unittest.TestCase):
-    def setUp(self):
-        # ava1 must sort before ava2
-        self.attr1    = 'cn'
-        self.value1   = 'Bob'
-        self.str_ava1 = '%s=%s' % (self.attr1, self.value1)
-        self.ava1     = AVA(self.attr1, self.value1)
-
-        self.str_rdn1 = '%s=%s' % (self.attr1, self.value1)
-        self.rdn1 = RDN((self.attr1, self.value1))
-
-        self.attr2    = 'ou'
-        self.value2   = 'people'
-        self.str_ava2 = '%s=%s' % (self.attr2, self.value2)
-        self.ava2     = AVA(self.attr2, self.value2)
-
-        self.str_rdn2 = '%s=%s' % (self.attr2, self.value2)
-        self.rdn2     = RDN((self.attr2, self.value2))
-
-        self.str_ava3 = '%s=%s+%s=%s' % (self.attr1, self.value1, self.attr2, self.value2)
-
-        self.str_rdn3 = '%s=%s+%s=%s' % (self.attr1, self.value1, self.attr2, self.value2)
-        self.rdn3 = RDN(self.ava1, self.ava2)
-
-    def test_create(self):
-        # Create with single attr,value pair
-        rdn1 = RDN((self.attr1, self.value1))
-        self.assertEqual(len(rdn1), 1)
-        self.assertEqual(rdn1, self.rdn1)
-        self.assertIsInstance(rdn1[0], AVA)
-        self.assertEqual(rdn1[0], self.ava1)
-
-        # Create with multiple attr,value pairs
-        rdn3 = RDN((self.attr1, self.value1), (self.attr2, self.value2))
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-        # Create with multiple attr,value pairs passed as lists
-        rdn3 = RDN([self.attr1, self.value1], [self.attr2, self.value2])
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-        # Create with multiple attr,value pairs but reverse
-        # constructor parameter ordering. RDN canonical ordering
-        # should remain the same
-        rdn3 = RDN((self.attr2, self.value2), (self.attr1, self.value1))
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-        # Create with single AVA object
-        rdn1 = RDN(self.ava1)
-        self.assertEqual(len(rdn1), 1)
-        self.assertEqual(rdn1, self.rdn1)
-        self.assertIsInstance(rdn1[0], AVA)
-        self.assertEqual(rdn1[0], self.ava1)
-
-        # Create with multiple AVA objects
-        rdn3 = RDN(self.ava1, self.ava2)
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-
-        # Create with multiple AVA objects but reverse constructor
-        # parameter ordering.  RDN canonical ordering should remain
-        # the same
-        rdn3 = RDN(self.ava2, self.ava1)
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-        # Create with single string with 1 AVA
-        rdn1 = RDN(self.str_rdn1)
-        self.assertEqual(len(rdn1), 1)
-        self.assertEqual(rdn1, self.rdn1)
-        self.assertIsInstance(rdn1[0], AVA)
-        self.assertEqual(rdn1[0], self.ava1)
-
-        # Create with single string with 2 AVA's
-        rdn3 = RDN(self.str_rdn3)
-        self.assertEqual(len(rdn3), 2)
-        self.assertEqual(rdn3, self.rdn3)
-        self.assertIsInstance(rdn3[0], AVA)
-        self.assertEqual(rdn3[0], self.ava1)
-        self.assertIsInstance(rdn3[1], AVA)
-        self.assertEqual(rdn3[1], self.ava2)
-
-    def test_properties(self):
-        self.assertEqual(self.rdn1.attr, self.attr1)
-        self.assertIsInstance(self.rdn1.attr, unicode)
-
-        self.assertEqual(self.rdn1.value, self.value1)
-        self.assertIsInstance(self.rdn1.value, unicode)
-
-        self.assertEqual(self.rdn2.attr, self.attr2)
-        self.assertIsInstance(self.rdn2.attr, unicode)
-
-        self.assertEqual(self.rdn2.value, self.value2)
-        self.assertIsInstance(self.rdn2.value, unicode)
-
-        self.assertEqual(self.rdn3.attr, self.attr1)
-        self.assertIsInstance(self.rdn3.attr, unicode)
-
-        self.assertEqual(self.rdn3.value, self.value1)
-        self.assertIsInstance(self.rdn3.value, unicode)
-
-    def test_str(self):
-        self.assertEqual(str(self.rdn1), self.str_rdn1)
-        self.assertIsInstance(str(self.rdn1), str)
-
-        self.assertEqual(str(self.rdn2), self.str_rdn2)
-        self.assertIsInstance(str(self.rdn2), str)
-
-        self.assertEqual(str(self.rdn3), self.str_rdn3)
-        self.assertIsInstance(str(self.rdn3), str)
-
-    def test_cmp(self):
-        # Equality
-        rdn1 = RDN((self.attr1, self.value1))
-
-        self.assertTrue(rdn1 == self.rdn1)
-        self.assertFalse(rdn1 != self.rdn1)
-
-        result = cmp(rdn1, self.rdn1)
-        self.assertEqual(result, 0)
-
-        # Make rdn1's attr greater
-        rdn1.attr = self.attr1 + "1"
-
-        self.assertFalse(rdn1 == self.rdn1)
-        self.assertTrue(rdn1 != self.rdn1)
-
-        result = cmp(rdn1, self.rdn1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.rdn1, rdn1)
-        self.assertEqual(result, -1)
-
-        # Reset rdn1's attr, should be equal again
-        rdn1.attr = self.attr1
-
-        result = cmp(rdn1, self.rdn1)
-        self.assertEqual(result, 0)
-
-        # Make rdn1's value greater
-        # attr will be equal, this tests secondary comparision component
-        rdn1.value = self.value1 + "1"
-
-        result = cmp(rdn1, self.rdn1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.rdn1, rdn1)
-        self.assertEqual(result, -1)
-
-        # Make sure rdn's with more ava's are greater
-        result = cmp(self.rdn1, self.rdn3)
-        self.assertEqual(result, -1)
-        result = cmp(self.rdn3, self.rdn1)
-        self.assertEqual(result, 1)
-
-    def test_indexing(self):
-        self.assertEqual(self.rdn1[0], self.ava1)
-        self.assertEqual(self.rdn1[self.ava1.attr], self.ava1.value)
-        with self.assertRaises(KeyError):
-            self.rdn1['foo']
-
-        self.assertEqual(self.rdn2[0], self.ava2)
-        self.assertEqual(self.rdn2[self.ava2.attr], self.ava2.value)
-        with self.assertRaises(KeyError):
-            self.rdn2['foo']
-
-        self.assertEqual(self.rdn3[0], self.ava1)
-        self.assertEqual(self.rdn3[self.ava1.attr], self.ava1.value)
-        self.assertEqual(self.rdn3[1], self.ava2)
-        self.assertEqual(self.rdn3[self.ava2.attr], self.ava2.value)
-        with self.assertRaises(KeyError):
-            self.rdn3['foo']
-
-        self.assertEqual(self.rdn1.attr, self.attr1)
-        self.assertEqual(self.rdn1.value, self.value1)
-
-        with self.assertRaises(TypeError):
-            self.rdn3[1.0]
-
-        # Slices
-        self.assertEqual(self.rdn3[0:1], [self.ava1])
-        self.assertEqual(self.rdn3[:],   [self.ava1, self.ava2])
-
-    def test_assignments(self):
-        rdn = RDN((self.attr1, self.value1))
-        rdn[0] = self.ava2
-        self.assertEqual(rdn, self.rdn2)
-
-        rdn = RDN((self.attr1, self.value1))
-        rdn[0] = (self.attr2, self.value2)
-        self.assertEqual(rdn, self.rdn2)
-
-        rdn  = RDN((self.attr1, self.value1))
-        rdn[self.attr1] = self.str_ava2
-        self.assertEqual(rdn[0], self.ava2)
-
-        # Can't assign multiples to single entry
-        rdn  = RDN((self.attr1, self.value1))
-        with self.assertRaises(TypeError):
-            rdn[self.attr1] = self.str_ava3
-
-        rdn  = RDN((self.attr1, self.value1))
-        with self.assertRaises(TypeError):
-            rdn[self.attr1] = (self.attr1, self.value1, self.attr2, self.value2)
-
-        rdn  = RDN((self.attr1, self.value1))
-        with self.assertRaises(TypeError):
-            rdn[self.attr1] = [(self.attr1, self.value1), (self.attr2, self.value2)]
-
-        # Slices
-        rdn  = RDN((self.attr1, self.value1))
-        self.assertEqual(rdn, self.rdn1)
-        rdn[0:1] = [self.ava2]
-        self.assertEqual(rdn, self.rdn2)
-
-        rdn  = RDN((self.attr1, self.value1))
-        self.assertEqual(rdn, self.rdn1)
-        rdn[:] = [(self.attr2, self.value2)]
-        self.assertEqual(rdn, self.rdn2)
-
-        rdn  = RDN((self.attr1, self.value1))
-        self.assertEqual(rdn, self.rdn1)
-        rdn[:] = [(self.attr1, self.value1),(self.attr2, self.value2)]
-        self.assertEqual(rdn, self.rdn3)
-
-        rdn  = RDN((self.attr1, self.value1))
-        self.assertEqual(rdn, self.rdn1)
-        rdn[0:1] = [(self.attr1, self.value1), (self.attr2, self.value2)]
-        self.assertEqual(rdn, self.rdn3)
-
-
-    def test_iter(self):
-        self.assertEqual(len(self.rdn1), 1)
-        self.assertEqual(self.rdn1[:], [self.ava1])
-        for i, ava in enumerate(self.rdn1):
-            if i == 0:
-                self.assertEqual(ava, self.ava1)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.rdn1)))
-
-        self.assertEqual(len(self.rdn2), 1)
-        self.assertEqual(self.rdn2[:], [self.ava2])
-        for i, ava in enumerate(self.rdn2):
-            if i == 0:
-                self.assertEqual(ava, self.ava2)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.rdn2)))
-
-        self.assertEqual(len(self.rdn3), 2)
-        self.assertEqual(self.rdn3[:], [self.ava1, self.ava2])
-        for i, ava in enumerate(self.rdn3):
-            if i == 0:
-                self.assertEqual(ava, self.ava1)
-            elif i == 1:
-                self.assertEqual(ava, self.ava2)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.rdn3)))
-
-
-    def test_concat(self):
-        rdn1 = RDN((self.attr1, self.value1))
-        rdn2 = RDN((self.attr2, self.value2))
-
-        # in-place addtion
-        rdn1 += rdn2
-        self.assertEqual(rdn1, self.rdn3)
-
-        rdn1 = RDN((self.attr1, self.value1))
-        rdn1 += self.ava2
-        self.assertEqual(rdn1, self.rdn3)
-
-        rdn1 = RDN((self.attr1, self.value1))
-        rdn1 += self.str_ava2
-        self.assertEqual(rdn1, self.rdn3)
-
-        # concatenation
-        rdn1 = RDN((self.attr1, self.value1))
-        rdn3 = rdn1 + rdn2
-        self.assertEqual(rdn3, self.rdn3)
-
-        rdn3 = rdn1 + self.ava2
-        self.assertEqual(rdn3, self.rdn3)
-
-        rdn3 = rdn1 + self.str_ava2
-        self.assertEqual(rdn3, self.rdn3)
-
-
-class TestDN(unittest.TestCase):
-    def setUp(self):
-        # ava1 must sort before ava2
-        self.attr1    = 'cn'
-        self.value1   = 'Bob'
-        self.str_ava1 = '%s=%s' % (self.attr1, self.value1)
-        self.ava1     = AVA(self.attr1, self.value1)
-
-        self.str_rdn1 = '%s=%s' % (self.attr1, self.value1)
-        self.rdn1     = RDN((self.attr1, self.value1))
-
-        self.attr2    = 'ou'
-        self.value2   = 'people'
-        self.str_ava2 = '%s=%s' % (self.attr2, self.value2)
-        self.ava2     = AVA(self.attr2, self.value2)
-
-        self.str_rdn2 = '%s=%s' % (self.attr2, self.value2)
-        self.rdn2     = RDN((self.attr2, self.value2))
-
-        self.str_dn1 = self.str_rdn1
-        self.dn1 = DN(self.rdn1)
-
-        self.str_dn2 = self.str_rdn2
-        self.dn2 = DN(self.rdn2)
-
-        self.str_dn3 = '%s,%s' % (self.str_rdn1, self.str_rdn2)
-        self.dn3 = DN(self.rdn1, self.rdn2)
-
-        self.base_rdn1 = RDN(('dc', 'redhat'))
-        self.base_rdn2 = RDN(('dc', 'com'))
-        self.base_dn = DN(self.base_rdn1, self.base_rdn2)
-
-        self.container_rdn1 = RDN(('cn', 'sudorules'))
-        self.container_rdn2 = RDN(('cn', 'sudo'))
-        self.container_dn = DN(self.container_rdn1, self.container_rdn2)
-
-        self.base_container_dn = DN((self.attr1, self.value1),
-                                    self.container_dn, self.base_dn)
-
-
-    def test_create(self):
-        # Create with single attr,value pair
-        dn1 = DN((self.attr1, self.value1))
-        self.assertEqual(len(dn1), 1)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-
-        # Create with single attr,value pair passed as a tuple
-        dn1 = DN((self.attr1, self.value1))
-        self.assertEqual(len(dn1), 1)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-
-        # Creation with multiple attr,value string pairs should fail
-        with self.assertRaises(ValueError):
-            dn1 = DN(self.attr1, self.value1, self.attr2, self.value2)
-
-        # Create with multiple attr,value pairs passed as tuples & lists
-        dn1 = DN((self.attr1, self.value1), [self.attr2, self.value2])
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn2)
-
-        # Create with multiple attr,value pairs passed as tuple and RDN
-        dn1 = DN((self.attr1, self.value1), RDN((self.attr2, self.value2)))
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn2)
-
-        # Create with multiple attr,value pairs but reverse
-        # constructor parameter ordering. RDN ordering should also be
-        # reversed because DN's are a ordered sequence of RDN's
-        dn1 = DN((self.attr2, self.value2), (self.attr1, self.value1))
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn2)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn1)
-
-        # Create with single RDN object
-        dn1 = DN(self.rdn1)
-        self.assertEqual(len(dn1), 1)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-
-        # Create with multiple RDN objects, assure ordering is preserved.
-        dn1 = DN(self.rdn1, self.rdn2)
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn2)
-
-        # Create with multiple RDN objects in different order, assure
-        # ordering is preserved.
-        dn1 = DN(self.rdn2, self.rdn1)
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn2)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn1)
-
-        # Create with single string with 1 RDN
-        dn1 = DN(self.str_rdn1)
-        self.assertEqual(len(dn1), 1)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-
-        # Create with single string with 2 RDN's
-        dn1 = DN(self.str_dn3)
-        self.assertEqual(len(dn1), 2)
-        self.assertIsInstance(dn1[0], RDN)
-        self.assertIsInstance(dn1[0].attr, unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0], self.rdn1)
-        self.assertIsInstance(dn1[1], RDN)
-        self.assertIsInstance(dn1[1].attr, unicode)
-        self.assertIsInstance(dn1[1].value, unicode)
-        self.assertEqual(dn1[1], self.rdn2)
-
-        # Create with RDN, and 2 DN's (e.g. attr + container + base)
-        dn1 = DN((self.attr1, self.value1), self.container_dn, self.base_dn)
-        self.assertEqual(len(dn1), 5)
-        dn_str = ','.join([str(self.rdn1),
-                           str(self.container_rdn1), str(self.container_rdn2),
-                           str(self.base_rdn1), str(self.base_rdn2)])
-        self.assertEqual(str(dn1), dn_str)
-
-    def test_str(self):
-        self.assertEqual(str(self.dn1), self.str_dn1)
-        self.assertIsInstance(str(self.dn1), str)
-
-        self.assertEqual(str(self.dn2), self.str_dn2)
-        self.assertIsInstance(str(self.dn2), str)
-
-        self.assertEqual(str(self.dn3), self.str_dn3)
-        self.assertIsInstance(str(self.dn3), str)
-
-    def test_cmp(self):
-        # Equality
-        dn1 = DN((self.attr1, self.value1))
-
-        self.assertTrue(dn1 == self.dn1)
-        self.assertFalse(dn1 != self.dn1)
-
-        result = cmp(dn1, self.dn1)
-        self.assertEqual(result, 0)
-
-        # Make dn1's attr greater
-        dn1[0].attr = self.attr1 + "1"
-
-        self.assertFalse(dn1 == self.dn1)
-        self.assertTrue(dn1 != self.dn1)
-
-        result = cmp(dn1, self.dn1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.dn1, dn1)
-        self.assertEqual(result, -1)
-
-        # Reset dn1's attr, should be equal again
-        dn1[0].attr = self.attr1
-
-        result = cmp(dn1, self.dn1)
-        self.assertEqual(result, 0)
-
-        # Make dn1's value greater
-        # attr will be equal, this tests secondary comparision component
-        dn1[0].value = self.value1 + "1"
-
-        result = cmp(dn1, self.dn1)
-        self.assertEqual(result, 1)
-
-        result = cmp(self.dn1, dn1)
-        self.assertEqual(result, -1)
-
-        # Make sure dn's with more rdn's are greater
-        result = cmp(self.dn1, self.dn3)
-        self.assertEqual(result, -1)
-        result = cmp(self.dn3, self.dn1)
-        self.assertEqual(result, 1)
-
-        # Test startswith, endswith
-        self.assertTrue(self.base_container_dn.startswith(self.rdn1))
-        self.assertTrue(self.base_container_dn.startswith(self.dn1))
-        self.assertTrue(self.base_container_dn.startswith(self.dn1 + self.container_dn))
-        self.assertFalse(self.base_container_dn.startswith(self.dn2))
-        self.assertFalse(self.base_container_dn.startswith(self.rdn2))
-        self.assertTrue(self.base_container_dn.startswith((self.dn1)))
-        self.assertTrue(self.base_container_dn.startswith((self.rdn1)))
-        self.assertFalse(self.base_container_dn.startswith((self.rdn2)))
-        self.assertTrue(self.base_container_dn.startswith((self.rdn2, self.rdn1)))
-        self.assertTrue(self.base_container_dn.startswith((self.dn1, self.dn2)))
-
-        self.assertTrue(self.base_container_dn.endswith(self.base_dn))
-        self.assertTrue(self.base_container_dn.endswith(self.container_dn + self.base_dn))
-        self.assertFalse(self.base_container_dn.endswith(DN(self.base_rdn1)))
-        self.assertTrue(self.base_container_dn.endswith(DN(self.base_rdn2)))
-        self.assertTrue(self.base_container_dn.endswith((DN(self.base_rdn1), DN(self.base_rdn2))))
-
-        # Test "in" membership
-        self.assertTrue(self.container_rdn1 in self.container_dn)
-        self.assertTrue(self.container_dn in self.container_dn)
-        self.assertFalse(self.base_rdn1 in self.container_dn)
-
-        self.assertTrue(self.container_rdn1 in self.base_container_dn)
-        self.assertTrue(self.container_dn in self.base_container_dn)
-        self.assertTrue(self.container_dn + self.base_dn in
-                        self.base_container_dn)
-        self.assertTrue(self.dn1 + self.container_dn + self.base_dn in
-                        self.base_container_dn)
-        self.assertTrue(self.dn1 + self.container_dn + self.base_dn ==
-                        self.base_container_dn)
-
-        self.assertFalse(self.container_rdn1 in self.base_dn)
-
-    def test_indexing(self):
-        self.assertEqual(self.dn1[0], self.rdn1)
-        self.assertEqual(self.dn1[self.rdn1.attr], self.rdn1.value)
-        with self.assertRaises(KeyError):
-            self.dn1['foo']
-
-        self.assertEqual(self.dn2[0], self.rdn2)
-        self.assertEqual(self.dn2[self.rdn2.attr], self.rdn2.value)
-        with self.assertRaises(KeyError):
-            self.dn2['foo']
-
-        self.assertEqual(self.dn3[0], self.rdn1)
-        self.assertEqual(self.dn3[self.rdn1.attr], self.rdn1.value)
-        self.assertEqual(self.dn3[1], self.rdn2)
-        self.assertEqual(self.dn3[self.rdn2.attr], self.rdn2.value)
-        with self.assertRaises(KeyError):
-            self.dn3['foo']
-
-        with self.assertRaises(TypeError):
-            self.dn3[1.0]
-
-    def test_assignments(self):
-        dn_low = 0
-        dn_high = 6
-
-        rdn_args = make_rdn_args(dn_low, dn_high, 'tuple',
-                                 default_rdn_attr_arg, default_rdn_value_arg)
-        dn1 = DN(*rdn_args)
-
-        rdn_args = make_rdn_args(dn_low, dn_high, 'list',
-                                 default_rdn_attr_arg, default_rdn_value_arg)
-        dn2 = DN(*rdn_args)
-
-        rdn_args = make_rdn_args(dn_low, dn_high, 'RDN',
-                                 default_rdn_attr_arg, default_rdn_value_arg)
-        dn3 = DN(*rdn_args)
-
-        self.assertEqual(dn1, dn2)
-        self.assertEqual(dn1, dn3)
-
-        for i in range(dn_low, dn_high):
-            attr = default_rdn_attr_arg(i)
-            value = default_rdn_value_arg(i)
-            self.assertEqual(dn1[i].attr, attr)
-            self.assertEqual(dn1[i].value, value)
-            self.assertEqual(dn1[attr], value)
-
-        for i in range(dn_low, dn_high):
-            if i % 2:
-                orig_attr = default_rdn_attr_arg(i)
-                attr = alt_rdn_attr_arg(i)
-                value = alt_rdn_value_arg(i)
-                dn1[i] = attr, value
-                dn2[orig_attr] = (attr, value)
-                dn3[i] = RDN((attr, value))
-
-        self.assertEqual(dn1, dn2)
-        self.assertEqual(dn1, dn3)
-
-        for i in range(dn_low, dn_high):
-            if i % 2:
-                attr = alt_rdn_attr_arg(i)
-                value = alt_rdn_value_arg(i)
-            else:
-                attr = default_rdn_attr_arg(i)
-                value = default_rdn_value_arg(i)
-            self.assertEqual(dn1[i].value, dn1[i].value)
-            self.assertEqual(dn1[attr], value)
-
-        # Slices
-        slice_low = 2
-        slice_high = 4
-        interval = range(slice_low, slice_high)
-
-        # Slices
-        # Assign via tuple
-        rdn_args = make_rdn_args(dn_low, dn_high, 'tuple',
-                                 default_rdn_attr_arg, default_rdn_value_arg)
-        dn1 = DN(*rdn_args)
-
-        dn_slice = make_rdn_args(slice_low, slice_high, 'tuple',
-                                 alt_rdn_attr_arg, alt_rdn_value_arg)
-
-        dn1[slice_low:slice_high] = dn_slice
-
-        for i in range(dn_low, dn_high):
-            if i in interval:
-                attr = alt_rdn_attr_arg(i)
-                value = alt_rdn_value_arg(i)
-            else:
-                attr = default_rdn_attr_arg(i)
-                value = default_rdn_value_arg(i)
-            self.assertEqual(dn1[i].value, dn1[i].value)
-            self.assertEqual(dn1[attr], value)
-
-        query_slice = dn1[slice_low:slice_high]
-        for i, query_rdn in enumerate(query_slice):
-            slice_rdn = RDN(dn_slice[i])
-            self.assertEqual(slice_rdn, query_rdn)
-
-        # insert
-        dn = DN(self.rdn2)
-        dn.insert(0, self.rdn1)
-        self.assertEqual(dn, self.dn3)
-
-        dn = DN(self.rdn1)
-        dn.insert(1, (self.attr2, self.value2))
-        self.assertEqual(dn, self.dn3)
-
-        # Slices
-        # Assign via RDN
-        rdn_args = make_rdn_args(dn_low, dn_high, 'tuple',
-                                 default_rdn_attr_arg, default_rdn_value_arg)
-        dn1 = DN(*rdn_args)
-
-        dn_slice = make_rdn_args(slice_low, slice_high, 'RDN',
-                                 alt_rdn_attr_arg, alt_rdn_value_arg)
-
-        dn1[slice_low:slice_high] = dn_slice
-
-        for i in range(dn_low, dn_high):
-            if i in interval:
-                attr = alt_rdn_attr_arg(i)
-                value = alt_rdn_value_arg(i)
-            else:
-                attr = default_rdn_attr_arg(i)
-                value = default_rdn_value_arg(i)
-            self.assertEqual(dn1[i].value, dn1[i].value)
-            self.assertEqual(dn1[attr], value)
-
-        query_slice = dn1[slice_low:slice_high]
-        for i, query_rdn in enumerate(query_slice):
-            slice_rdn = dn_slice[i]
-            self.assertEqual(slice_rdn, query_rdn)
-
-
-    def test_iter(self):
-        self.assertEqual(len(self.dn1), 1)
-        self.assertEqual(self.dn1[:], [self.rdn1])
-        for i, ava in enumerate(self.dn1):
-            if i == 0:
-                self.assertEqual(ava, self.rdn1)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.rdn1)))
-
-        self.assertEqual(len(self.dn2), 1)
-        self.assertEqual(self.dn2[:], [self.rdn2])
-        for i, ava in enumerate(self.dn2):
-            if i == 0:
-                self.assertEqual(ava, self.rdn2)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.rdn2)))
-
-        self.assertEqual(len(self.dn3), 2)
-        self.assertEqual(self.dn3[:], [self.rdn1, self.rdn2])
-        for i, ava in enumerate(self.dn3):
-            if i == 0:
-                self.assertEqual(ava, self.rdn1)
-            elif i == 1:
-                self.assertEqual(ava, self.rdn2)
-            else:
-                self.fail("got iteration index %d, but len=%d" % (i, len(self.dn3)))
-
-
-    def test_concat(self):
-        dn1 = DN((self.attr1, self.value1))
-        dn2 = DN([self.attr2, self.value2])
-
-        # in-place addtion
-        dn1 += dn2
-        self.assertEqual(dn1, self.dn3)
-
-        dn1 = DN((self.attr1, self.value1))
-        dn1 += self.rdn2
-        self.assertEqual(dn1, self.dn3)
-
-        dn1 = DN((self.attr1, self.value1))
-        dn1 += self.dn2
-        self.assertEqual(dn1, self.dn3)
-
-        dn1 = DN((self.attr1, self.value1))
-        dn1 += self.str_dn2
-        self.assertEqual(dn1, self.dn3)
-
-        # concatenation
-        dn1 = DN((self.attr1, self.value1))
-        dn3 = dn1 + dn2
-        self.assertEqual(dn3, self.dn3)
-
-        dn1 = DN((self.attr1, self.value1))
-        dn3 = dn1 + self.rdn2
-        self.assertEqual(dn3, self.dn3)
-
-        dn3 = dn1 + self.str_rdn2
-        self.assertEqual(dn3, self.dn3)
-
-        dn3 = dn1 + self.str_dn2
-        self.assertEqual(dn3, self.dn3)
-
-        dn3 = dn1 + self.dn2
-        self.assertEqual(dn3, self.dn3)
-
-class TestEscapes(unittest.TestCase):
-    def setUp(self):
-        self.privilege = 'R,W privilege'
-        self.dn_str_hex_escape = 'cn=R\\2cW privilege,cn=privileges,cn=pbac,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com'
-        self.dn_str_backslash_escape = 'cn=R\\,W privilege,cn=privileges,cn=pbac,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com'
-
-    def test_escape(self):
-        dn = DN(self.dn_str_hex_escape)
-        self.assertEqual(dn['cn'], self.privilege)
-        self.assertEqual(dn[0].value, self.privilege)
-
-        dn = DN(self.dn_str_backslash_escape)
-        self.assertEqual(dn['cn'], self.privilege)
-        self.assertEqual(dn[0].value, self.privilege)
-
-class TestInternationalization(unittest.TestCase):
-    def setUp(self):
-        # Hello in Arabic
-        self.arabic_hello_utf8 = '\xd9\x85\xd9\x83\xd9\x8a\xd9\x84' + \
-                                 '\xd8\xb9\x20\xd9\x85\xd8\xa7\xd9' + \
-                                 '\x84\xd9\x91\xd8\xb3\xd9\x84\xd8\xa7'
-
-        self.arabic_hello_unicode = self.arabic_hello_utf8.decode('utf-8')
-
-    def test_i18n(self):
-        self.assertEqual(self.arabic_hello_utf8,
-                         self.arabic_hello_unicode.encode('utf-8'))
-
-        # AVA's
-        # test attr i18n
-        ava1 = AVA(self.arabic_hello_unicode, 'foo')
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-        self.assertEqual(ava1.attr, self.arabic_hello_unicode)
-        self.assertEqual(str(ava1), self.arabic_hello_utf8+'=foo')
-
-        ava1 = AVA(self.arabic_hello_utf8, 'foo')
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-        self.assertEqual(ava1.attr, self.arabic_hello_unicode)
-        self.assertEqual(str(ava1), self.arabic_hello_utf8+'=foo')
-
-        # test value i18n
-        ava1 = AVA('cn', self.arabic_hello_unicode)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-        self.assertEqual(ava1.value, self.arabic_hello_unicode)
-        self.assertEqual(str(ava1), 'cn='+self.arabic_hello_utf8)
-
-        ava1 = AVA('cn', self.arabic_hello_utf8)
-        self.assertIsInstance(ava1.attr,  unicode)
-        self.assertIsInstance(ava1.value, unicode)
-        self.assertEqual(ava1.value, self.arabic_hello_unicode)
-        self.assertEqual(str(ava1), 'cn='+self.arabic_hello_utf8)
-
-        # RDN's
-        # test attr i18n
-        rdn1 = RDN((self.arabic_hello_unicode, 'foo'))
-        self.assertIsInstance(rdn1.attr,  unicode)
-        self.assertIsInstance(rdn1.value, unicode)
-        self.assertEqual(rdn1.attr, self.arabic_hello_unicode)
-        self.assertEqual(str(rdn1), self.arabic_hello_utf8+'=foo')
-
-        rdn1 = RDN((self.arabic_hello_utf8, 'foo'))
-        self.assertIsInstance(rdn1.attr,  unicode)
-        self.assertIsInstance(rdn1.value, unicode)
-        self.assertEqual(rdn1.attr, self.arabic_hello_unicode)
-        self.assertEqual(str(rdn1), self.arabic_hello_utf8+'=foo')
-
-        # test value i18n
-        rdn1 = RDN(('cn', self.arabic_hello_unicode))
-        self.assertIsInstance(rdn1.attr,  unicode)
-        self.assertIsInstance(rdn1.value, unicode)
-        self.assertEqual(rdn1.value, self.arabic_hello_unicode)
-        self.assertEqual(str(rdn1), 'cn='+self.arabic_hello_utf8)
-
-        rdn1 = RDN(('cn', self.arabic_hello_utf8))
-        self.assertIsInstance(rdn1.attr,  unicode)
-        self.assertIsInstance(rdn1.value, unicode)
-        self.assertEqual(rdn1.value, self.arabic_hello_unicode)
-        self.assertEqual(str(rdn1), 'cn='+self.arabic_hello_utf8)
-
-        # DN's
-        # test attr i18n
-        dn1 = DN((self.arabic_hello_unicode, 'foo'))
-        self.assertIsInstance(dn1[0].attr,  unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0].attr, self.arabic_hello_unicode)
-        self.assertEqual(str(dn1), self.arabic_hello_utf8+'=foo')
-
-        dn1 = DN((self.arabic_hello_utf8, 'foo'))
-        self.assertIsInstance(dn1[0].attr,  unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0].attr, self.arabic_hello_unicode)
-        self.assertEqual(str(dn1), self.arabic_hello_utf8+'=foo')
-
-        # test value i18n
-        dn1 = DN(('cn', self.arabic_hello_unicode))
-        self.assertIsInstance(dn1[0].attr,  unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0].value, self.arabic_hello_unicode)
-        self.assertEqual(str(dn1), 'cn='+self.arabic_hello_utf8)
-
-        dn1 = DN(('cn', self.arabic_hello_utf8))
-        self.assertIsInstance(dn1[0].attr,  unicode)
-        self.assertIsInstance(dn1[0].value, unicode)
-        self.assertEqual(dn1[0].value, self.arabic_hello_unicode)
-        self.assertEqual(str(dn1), 'cn='+self.arabic_hello_utf8)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_ipalib/test_encoder.py b/tests/test_ipalib/test_encoder.py
deleted file mode 100644
index 430eda047..000000000
--- a/tests/test_ipalib/test_encoder.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# encoding: utf-8
-# Authors:
-#   Pavel Zuna <pzuna@redhat.com>
-#
-# Copyright (C) 2009  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-Test the `ipalib.encoder` module.
-"""
-
-import string
-
-from tests.util import ClassChecker, assert_equal
-from ipalib.encoder import Encoder, EncoderSettings, encode_args, decode_retval
-
-_encoder_settings = EncoderSettings()
-
-_test_str_d = u'ěščřžýáíé'
-_test_str_e = u'ěščřžýáíé'.encode(_encoder_settings.encode_to)
-
-
-class test_Encoder(ClassChecker):
-    """
-    Test the `ipalib.encoder.Encoder` class.
-    """
-    _cls = Encoder
-
-    def test_encode(self):
-        """
-        Test the `ipalib.encoder.Encoder.encode` method.
-        """
-        o = self.cls()
-        encode_to = o.encoder_settings.encode_to
-        o.encoder_settings.encode_postprocessor = lambda x: x
-        # strings
-        assert_equal(o.encode('ahoj'), 'ahoj'.encode(encode_to))
-        assert_equal(o.encode(_test_str_d), _test_str_e)
-        # bool, float, int, long
-        assert_equal(o.encode(True), 'TRUE'.encode(encode_to))
-        assert_equal(o.encode(1.01), str(1.01).encode(encode_to))
-        assert_equal(o.encode(1000), str(1000).encode(encode_to))
-        assert_equal(o.encode(long(1)), str(long(1)).encode(encode_to))
-        # lists
-        expected = [_test_str_e, '1']
-        assert_equal(o.encode([_test_str_d, 1]), expected)
-        expected = ['1', ['1', '2', '3']]
-        assert_equal(o.encode([1, [1, 2, 3]]), expected)
-        # tuples
-        expected = (_test_str_e, '1')
-        assert_equal(o.encode((_test_str_d, 1)), expected)
-        expected = ('1', ('1', '2', '3'))
-        assert_equal(o.encode((1, (1, 2, 3))), expected)
-        # dicts: only values, no postprocessing
-        o.encoder_settings.encode_dict_keys = False
-        o.encoder_settings.encode_dict_keys_postprocess = False
-        o.encoder_settings.encode_dict_vals = True
-        o.encoder_settings.encode_dict_vals_postprocess = False
-        expected = {_test_str_d: _test_str_e}
-        assert_equal(o.encode({_test_str_d: _test_str_d}), expected)
-        # dicts: only keys, no postprocessing
-        o.encoder_settings.encode_dict_keys = True
-        o.encoder_settings.encode_dict_vals = False
-        expected = {_test_str_e: _test_str_d}
-        assert_equal(o.encode({_test_str_d: _test_str_d}), expected)
-        # dicts: both keys and values, no postprocessing
-        o.encoder_settings.encode_dict_vals = True
-        expected = {_test_str_e: _test_str_e}
-        assert_equal(o.encode({_test_str_d: _test_str_d}), expected)
-        # dicts: both keys and values, postprocessing on keys only
-        o.encoder_settings.encode_dict_keys = True
-        o.encoder_settings.encode_dict_keys_postprocess = True
-        o.encoder_settings.encode_postprocessor = string.upper
-        expected = {_test_str_e.upper(): _test_str_e}
-        assert_equal(o.encode({u'ěščřžýáíé': u'ěščřžýáíé'}), expected)
-        # None
-        o.encoder_settings.encode_postprocessor = lambda x: x
-        o.encoder_settings.encode_none = False
-        assert_equal(o.encode(None), None)
-        o.encoder_settings.encode_none = True
-        assert_equal(o.encode(None), str(None).encode(encode_to))
-
-    def test_decode(self):
-        """
-        Test the `ipalib.encoder.Encoder.decode` method.
-        """
-        o = self.cls()
-        decode_from = o.encoder_settings.decode_from
-        o.encoder_settings.decode_postprocessor = lambda x: x
-        # strings
-        assert_equal(o.decode('ahoj'), 'ahoj'.decode(decode_from))
-        assert_equal(o.decode(_test_str_e), _test_str_d)
-        # bool, float, int, long
-        assert_equal(o.decode('True'), str(True).decode(decode_from))
-        assert_equal(o.decode('1.01'), str(1.01).decode(decode_from))
-        assert_equal(o.decode('1000'), str(1000).decode(decode_from))
-        assert_equal(o.decode('1'), str(long(1)).decode(decode_from))
-        # lists
-        expected = [_test_str_d, '1']
-        assert_equal(o.decode([_test_str_e, '1']), expected)
-        expected = [u'1', [u'1', u'2', u'3']]
-        assert_equal(o.decode(['1', ['1', '2', '3']]), expected)
-        # tuples
-        expected = (_test_str_d, 1)
-        assert_equal(o.decode((_test_str_e, 1)), expected)
-        expected = (u'1', (u'1', u'2', u'3'))
-        assert_equal(o.decode(('1', ('1', '2', '3'))), expected)
-        # dicts: only values, no postprocessing
-        o.encoder_settings.decode_dict_keys = False
-        o.encoder_settings.decode_dict_keys_postprocess = False
-        o.encoder_settings.decode_dict_vals = True
-        o.encoder_settings.decode_dict_vals_postprocess = False
-        expected = {_test_str_e: _test_str_d}
-        assert_equal(o.decode({_test_str_e: _test_str_e}), expected)
-        # dicts: only keys, no postprocessing
-        o.encoder_settings.decode_dict_keys = True
-        o.encoder_settings.decode_dict_vals = False
-        expected = {_test_str_d: _test_str_e}
-        assert_equal(o.decode({_test_str_e: _test_str_e}), expected)
-        # dicts: both keys and values, no postprocessing
-        o.encoder_settings.decode_dict_vals = True
-        expected = {_test_str_d: _test_str_d}
-        assert_equal(o.decode({_test_str_e: _test_str_e}), expected)
-        # dicts: both keys and values, postprocessing on keys only
-        o.encoder_settings.decode_dict_keys = True
-        o.encoder_settings.decode_dict_keys_postprocess = True
-        o.encoder_settings.decode_postprocessor = string.upper
-        expected = {_test_str_d.upper(): _test_str_d}
-        assert_equal(o.decode({_test_str_e: _test_str_e}), expected)
-        # TODO: dict decoding using a table
-        # None
-        o.encoder_settings.decode_postprocessor = lambda x: x
-        o.encoder_settings.decode_none = False
-        assert_equal(o.decode(None), None)
-        o.encoder_settings.decode_none = True
-        assert_equal(o.decode(None), str(None).decode(decode_from))
-
diff --git a/tests/test_ipalib/test_x509.py b/tests/test_ipalib/test_x509.py
index a2e9b2265..cf076313e 100644
--- a/tests/test_ipalib/test_x509.py
+++ b/tests/test_ipalib/test_x509.py
@@ -32,7 +32,7 @@ from ipalib.constants import NAME_REGEX, NAME_ERROR
 import base64
 from ipalib import x509
 from nss.error import NSPRError
-from ipalib.dn import *
+from ipapython.dn import DN
 
 # certutil -