[1261] fixed the interface mismatch: actual DataSource API expectes

'delete_rrset', not 'remove_rrset'.  To make things consistent,
also removed the corresponding Diff methods from 'remove_data' to
'delete_data'.

src/lib/python/isc/xfrin/diff.py

@@ -73,7 +73,7 @@ class Diff:
         """
         Schedules an operation with rr.
 
-        It does all the real work of add_data and remove_data, including
+        It does all the real work of add_data and delete_data, including
         all checks.
         """
         self.__check_commited()
@@ -95,9 +95,9 @@ class Diff:
         """
         self.__data_common(rr, 'add')
 
-    def remove_data(self, rr):
+    def delete_data(self, rr):
         """
-        Schedules removal of an RR from the zone in this diff.
+        Schedules deleting an RR from the zone in this diff.
 
         The rr is of isc.dns.RRset type and it must contain only one RR.
         If this is not the case or if the diff was already commited, this
@@ -156,7 +156,7 @@ class Diff:
             if operation == 'add':
                 self.__updater.add_rrset(rrset)
             elif operation == 'remove':
-                self.__updater.remove_rrset(rrset)
+                self.__updater.delete_rrset(rrset)
             else:
                 raise ValueError('Unknown operation ' + operation)
         # As everything is already in, drop the buffer

src/lib/python/isc/xfrin/tests/diff_tests.py

@@ -164,7 +164,7 @@ class DiffTest(unittest.TestCase):
         Also try passing an rrset that has different amount of RRs than 1.
         """
         diff = Diff(self, Name('example.org.'))
-        self.__data_common(diff, diff.remove_data, 'remove')
+        self.__data_common(diff, diff.delete_data, 'remove')
 
     def test_apply(self):
         """
@@ -174,7 +174,7 @@ class DiffTest(unittest.TestCase):
         # Prepare the diff
         diff = Diff(self, Name('example.org.'))
         diff.add_data(self.__rrset1)
-        diff.remove_data(self.__rrset2)
+        diff.delete_data(self.__rrset2)
         dlist = [('add', self.__rrset1), ('remove', self.__rrset2)]
         self.assertEqual(dlist, diff.get_buffer())
         # Do the apply, hook the compact method
@@ -209,7 +209,7 @@ class DiffTest(unittest.TestCase):
         # Now check all range of other methods raise ValueError
         self.assertRaises(ValueError, diff.commit)
         self.assertRaises(ValueError, diff.add_data, self.__rrset2)
-        self.assertRaises(ValueError, diff.remove_data, self.__rrset1)
+        self.assertRaises(ValueError, diff.delete_data, self.__rrset1)
         diff.apply = orig_apply
         self.assertRaises(ValueError, diff.apply)
         # This one does not state it should raise, so check it doesn't
@@ -249,11 +249,11 @@ class DiffTest(unittest.TestCase):
         # Similar with remove
         self.__apply_called = False
         for i in range(0, 99):
-            diff.remove_data(self.__rrset2)
+            diff.delete_data(self.__rrset2)
         expected = [('remove', self.__rrset2)] * 99
         self.assertEqual(expected, diff.get_buffer())
         self.assertFalse(self.__apply_called)
-        diff.remove_data(self.__rrset2)
+        diff.delete_data(self.__rrset2)
         self.assertTrue(self.__apply_called)
 
     def test_compact(self):
@@ -295,7 +295,7 @@ class DiffTest(unittest.TestCase):
                 if op == 'add':
                     diff.add_data(rrset)
                 else:
-                    diff.remove_data(rrset)
+                    diff.delete_data(rrset)
         # Compact it
         diff.compact()
         # Now check they got compacted. They should be in the same order as