nautobot 2.4.0__py3-none-any.whl → 2.4.0b1__py3-none-any.whl

nautobot/ipam/tests/test_migrations.py

@@ -29,29 +29,29 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
             request_id=uuid.uuid4(),
         )
 
-    def populateDataBeforeMigration(self, installed_apps):
+    def populateDataBeforeMigration(self, apps):
         """Populate Aggregate data before migrating to Prefixes"""
 
-        self.aggregate = installed_apps.get_model("ipam", "Aggregate")
+        self.aggregate = apps.get_model("ipam", "Aggregate")
         # Workaround for django-taggit manager not working in migrations.
         # https://github.com/jazzband/django-taggit/issues/101
         # https://github.com/jazzband/django-taggit/issues/454
         self.aggregate.tags = TagsField()
-        self.computed_field = installed_apps.get_model("extras", "computedfield")
-        self.content_type = installed_apps.get_model("contenttypes", "ContentType")
-        self.custom_field = installed_apps.get_model("extras", "customfield")
-        self.custom_link = installed_apps.get_model("extras", "customlink")
-        self.dynamic_group = installed_apps.get_model("extras", "DynamicGroup")
-        self.note = installed_apps.get_model("extras", "note")
-        self.object_change = installed_apps.get_model("extras", "objectchange")
-        self.object_permission = installed_apps.get_model("users", "objectpermission")
-        self.prefix = installed_apps.get_model("ipam", "prefix")
+        self.computed_field = apps.get_model("extras", "computedfield")
+        self.content_type = apps.get_model("contenttypes", "ContentType")
+        self.custom_field = apps.get_model("extras", "customfield")
+        self.custom_link = apps.get_model("extras", "customlink")
+        self.dynamic_group = apps.get_model("extras", "DynamicGroup")
+        self.note = apps.get_model("extras", "note")
+        self.object_change = apps.get_model("extras", "objectchange")
+        self.object_permission = apps.get_model("users", "objectpermission")
+        self.prefix = apps.get_model("ipam", "prefix")
         self.prefix.tags = TagsField()
-        self.relationship = installed_apps.get_model("extras", "relationship")
-        self.relationship_association = installed_apps.get_model("extras", "relationshipassociation")
-        self.rir = installed_apps.get_model("ipam", "RIR")
-        self.status = installed_apps.get_model("extras", "status")
-        self.tag = installed_apps.get_model("extras", "tag")
+        self.relationship = apps.get_model("extras", "relationship")
+        self.relationship_association = apps.get_model("extras", "relationshipassociation")
+        self.rir = apps.get_model("ipam", "RIR")
+        self.status = apps.get_model("extras", "status")
+        self.tag = apps.get_model("extras", "tag")
 
         self.aggregate_ct = self.content_type.objects.get_for_model(self.aggregate)
         self.prefix_ct = self.content_type.objects.get_for_model(self.prefix)
@@ -114,8 +114,8 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         self.aggregate1.tags.add("AggregateTagA", "AggregateTagB")
         self.aggregate2.tags.add("AggregateTagA")
         self.aggregate3.tags.add("AggregateTagB")
-        self.aggregate5.tags.add("AggregateTagA", "AggregateTagB")  # pylint: disable=no-member
-        self.aggregate6.tags.add("AggregateTagB")  # pylint: disable=no-member
+        self.aggregate5.tags.add("AggregateTagA", "AggregateTagB")
+        self.aggregate6.tags.add("AggregateTagB")
 
         # notes
         self.note.objects.create(
@@ -141,7 +141,7 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         self.note.objects.create(
             note="Aggregate5 test note",
             assigned_object_type=self.aggregate_ct,
-            assigned_object_id=self.aggregate5.id,  # pylint: disable=no-member
+            assigned_object_id=self.aggregate5.id,
         )
 
         # object permissions
@@ -157,8 +157,8 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
         # object changes
         self._create_objectchange(self.prefix1, "Pre-migration object change for prefix1")
         self._create_objectchange(self.prefix4, "Pre-migration object change for prefix4")
-        self._create_objectchange(self.prefix5, "Pre-migration object change for prefix5")  # pylint: disable=no-member
-        self._create_objectchange(self.aggregate5, "Pre-migration object change for aggregate5")  # pylint: disable=no-member
+        self._create_objectchange(self.prefix5, "Pre-migration object change for prefix5")
+        self._create_objectchange(self.aggregate5, "Pre-migration object change for aggregate5")
 
         # custom fields
         prefix_cf1 = self.custom_field.objects.create(name="prefixcf1")
@@ -179,24 +179,24 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
 
         self.aggregate3._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate3"
 
-        self.prefix5._custom_field_data["prefixcf1"] = "testdata prefixcf1 prefix5"  # pylint: disable=no-member
-        self.prefix5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 prefix5"  # pylint: disable=no-member
+        self.prefix5._custom_field_data["prefixcf1"] = "testdata prefixcf1 prefix5"
+        self.prefix5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 prefix5"
 
-        self.aggregate5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate5"  # pylint: disable=no-member
-        self.aggregate5._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate5"  # pylint: disable=no-member
+        self.aggregate5._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate5"
+        self.aggregate5._custom_field_data["aggregatecf1"] = "testdata aggregatecf1 aggregate5"
 
-        self.aggregate6._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate6"  # pylint: disable=no-member
+        self.aggregate6._custom_field_data["prefixaggregatecf1"] = "testdata prefixaggregatecf1 aggregate6"
 
         self.prefix1.save()
         self.prefix2.save()
         self.prefix3.save()
         self.prefix4.save()
-        self.prefix5.save()  # pylint: disable=no-member
+        self.prefix5.save()
         self.aggregate1.save()
         self.aggregate2.save()
         self.aggregate3.save()
-        self.aggregate5.save()  # pylint: disable=no-member
-        self.aggregate6.save()  # pylint: disable=no-member
+        self.aggregate5.save()
+        self.aggregate6.save()
 
     @skipIf(
         connection.vendor != "postgresql",
@@ -390,7 +390,7 @@ class AggregateToPrefixMigrationTestCase(NautobotDataMigrationTest):
                 2,
             )
 
-        for prefix in (self.prefix2, self.prefix3, self.prefix5):  # pylint: disable=no-member
+        for prefix in (self.prefix2, self.prefix3, self.prefix5):
             self.assertEqual(
                 self.object_change.objects.filter(changed_object_id=prefix.id).count(),
                 1,

nautobot/ipam/tests/test_models.py

@@ -1,5 +1,4 @@
 from unittest import skipIf
-from unittest.mock import patch
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
@@ -414,42 +413,6 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         self.child1 = Prefix.objects.create(prefix="101.102.0.0/26", status=self.status, namespace=self.namespace)
         self.child2 = Prefix.objects.create(prefix="101.102.0.64/26", status=self.status, namespace=self.namespace)
 
-    def test_parent_exists_after_model_clean(self):
-        prefix = Prefix(
-            prefix="101.102.0.128/26",
-            status=self.status,
-            namespace=self.namespace,
-            type=PrefixTypeChoices.TYPE_CONTAINER,
-        )
-        prefix.clean()
-        self.assertEqual(prefix.parent, self.root)
-
-    def test_reparent_subnets_and_reparent_ips_call(self):
-        """Assert reparent_subnets and reparent_ips are only called if there is an update to either of network, namespace or prefix_length"""
-        prefix_ip = "101.102.0.0/28"
-        with self.subTest("Assert reparent_subnets"):
-            with patch.object(Prefix, "reparent_subnets", return_value=None) as mock_reparent_subnets:
-                Prefix.objects.create(prefix=prefix_ip, status=self.status, namespace=self.namespace)
-                mock_reparent_subnets.assert_called_once()
-
-            with patch.object(Prefix, "reparent_subnets", return_value=None) as mock_reparent_subnets:
-                prefix = Prefix.objects.get(prefix=prefix_ip)
-                prefix.description = "Sample Description"
-                prefix.save()
-                mock_reparent_subnets.assert_not_called()
-                prefix.delete()
-
-        with self.subTest("Assert reparent_ips"):
-            with patch.object(Prefix, "reparent_ips", return_value=None) as reparent_ips:
-                Prefix.objects.create(prefix=prefix_ip, status=self.status, namespace=self.namespace)
-                reparent_ips.assert_called_once()
-
-            with patch.object(Prefix, "reparent_ips", return_value=None) as reparent_ips:
-                prefix = Prefix.objects.get(prefix=prefix_ip)
-                prefix.description = "Sample Description"
-                prefix.save()
-                reparent_ips.assert_not_called()
-
     def test_location_queries(self):
         locations = Location.objects.all()[:4]
         for location in locations:
@@ -513,68 +476,51 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         """Test the various ways of creating a Prefix all result in correctly populated fields."""
         with self.subTest("Creation with a prefix and status"):
             prefix = Prefix(prefix="192.0.3.0/24", status=self.status)
-            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
-                method()
-                self.assertEqual(prefix.network, "192.0.3.0")
-                self.assertEqual(prefix.broadcast, "192.0.3.255")
-                self.assertEqual(prefix.prefix_length, 24)
-                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
-                # parent field is tested exhaustively below
-                self.assertEqual(prefix.ip_version, 4)
-                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
-
-        with self.subTest("Creation with a network and prefix_length"):
-            prefix = Prefix(network="192.0.4.0", prefix_length=24, status=self.status)
-            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
-                method()
-                self.assertEqual(prefix.network, "192.0.4.0")
-                self.assertEqual(prefix.broadcast, "192.0.4.255")
-                self.assertEqual(prefix.prefix_length, 24)
-                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
-                # parent field is tested exhaustively below
-                self.assertEqual(prefix.ip_version, 4)
-                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
-                self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.4.0/24"))
+            prefix.save()
+            self.assertEqual(prefix.network, "192.0.3.0")
+            self.assertEqual(prefix.broadcast, "192.0.3.255")
+            self.assertEqual(prefix.prefix_length, 24)
+            self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
+            # parent field is tested exhaustively below
+            self.assertEqual(prefix.ip_version, 4)
+            self.assertEqual(prefix.namespace, get_default_namespace())  # default value
 
         with self.subTest("Creation with a network, broadcast, and prefix_length"):
-            prefix = Prefix(network="192.0.5.0", broadcast="192.0.5.255", prefix_length=24, status=self.status)
-            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
-                method()
-                self.assertEqual(prefix.network, "192.0.5.0")
-                self.assertEqual(prefix.broadcast, "192.0.5.255")
-                self.assertEqual(prefix.prefix_length, 24)
-                self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
-                # parent field is tested exhaustively below
-                self.assertEqual(prefix.ip_version, 4)
-                self.assertEqual(prefix.namespace, get_default_namespace())  # default value
-                self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.5.0/24"))
-
-        with self.subTest("With conflicting values - prefix overrules network/broadcast/prefix_length/ip_version"):
+            prefix = Prefix(network="192.0.4.0", broadcast="192.0.4.255", prefix_length=24, status=self.status)
+            prefix.save()
+            self.assertEqual(prefix.network, "192.0.4.0")
+            self.assertEqual(prefix.broadcast, "192.0.4.255")
+            self.assertEqual(prefix.prefix_length, 24)
+            self.assertEqual(prefix.type, PrefixTypeChoices.TYPE_NETWORK)  # default value
+            # parent field is tested exhaustively below
+            self.assertEqual(prefix.ip_version, 4)
+            self.assertEqual(prefix.namespace, get_default_namespace())  # default value
+            self.assertEqual(prefix.prefix, netaddr.IPNetwork("192.0.4.0/24"))
+
+        with self.subTest("Creation with conflicting values - prefix takes precedence"):
             prefix = Prefix(
-                prefix="192.0.6.0/24",
+                prefix="192.0.5.0/24",
                 status=self.status,
                 network="1.1.1.1",
                 broadcast="2.2.2.2",
                 prefix_length=27,
                 ip_version=6,
             )
-            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
-                method()
-                self.assertEqual(prefix.network, "192.0.6.0")
-                self.assertEqual(prefix.broadcast, "192.0.6.255")
-                self.assertEqual(prefix.prefix_length, 24)
-                self.assertEqual(prefix.ip_version, 4)
-
-        with self.subTest("With conflicting values - network/prefix_length overrule broadcast/ip_version"):
+            prefix.save()
+            self.assertEqual(prefix.network, "192.0.5.0")
+            self.assertEqual(prefix.broadcast, "192.0.5.255")
+            self.assertEqual(prefix.prefix_length, 24)
+            self.assertEqual(prefix.ip_version, 4)
+
+        with self.subTest("Creation with conflicting values - network and prefix_length take precedence"):
             prefix = Prefix(
-                status=self.status, network="192.0.7.0", prefix_length=24, broadcast="192.0.7.127", ip_version=6
+                status=self.status, network="192.0.6.0", prefix_length=24, broadcast="192.0.6.127", ip_version=6
             )
-            for method in [prefix.clean, prefix.save, prefix.refresh_from_db]:
-                method()
-                self.assertEqual(prefix.network, "192.0.7.0")
-                self.assertEqual(prefix.broadcast, "192.0.7.255")
-                self.assertEqual(prefix.prefix_length, 24)
-                self.assertEqual(prefix.ip_version, 4)
+            prefix.save()
+            self.assertEqual(prefix.network, "192.0.6.0")
+            self.assertEqual(prefix.broadcast, "192.0.6.255")
+            self.assertEqual(prefix.prefix_length, 24)
+            self.assertEqual(prefix.ip_version, 4)
 
     def test_tree_methods(self):
         """Test the various tree methods work as expected."""
@@ -820,13 +766,6 @@ class TestPrefix(ModelTestCases.BaseModelTestCase):
         IPAddress.objects.create(address="10.0.0.4/24", status=self.status, namespace=self.namespace)
         self.assertEqual(parent_prefix.get_first_available_ip(), "10.0.0.5/24")
 
-    def test_get_first_available_ip_calculate_child_ips(self):
-        parent_prefix = Prefix.objects.create(prefix="10.0.3.0/29", status=self.status, namespace=self.namespace)
-        Prefix.objects.create(prefix="10.0.3.0/30", status=self.status, namespace=self.namespace)
-        IPAddress(address="10.0.3.1/30", status=self.status, namespace=self.namespace).save()
-
-        self.assertEqual(parent_prefix.get_first_available_ip(), "10.0.3.2/29")
-
     def test_get_utilization(self):
         # Container Prefix
         prefix = Prefix.objects.create(

nautobot/ipam/tests/test_querysets.py

@@ -1,15 +1,13 @@
 import re
 from unittest import skipIf
 
-from django.contrib.contenttypes.models import ContentType
-from django.db import connection, transaction
+from django.db import connection
 import netaddr
 
 from nautobot.core.testing import TestCase
 from nautobot.extras.models import Status
 from nautobot.ipam import choices
 from nautobot.ipam.models import IPAddress, Namespace, Prefix
-from nautobot.users.models import ObjectPermission
 
 
 class IPAddressQuerySet(TestCase):
@@ -268,28 +266,6 @@ class IPAddressQuerySet(TestCase):
             [instance for ip, instance in self.ips.items() if "10.0.0" in ip],
         )
 
-    def test_lookup_not_ambiguous(self):
-        """Check for issues like https://github.com/nautobot/nautobot/issues/5166."""
-        obj_perm = ObjectPermission.objects.create(name="Test Permission", constraints={}, actions=["view"])
-        obj_perm.object_types.add(ContentType.objects.get_for_model(IPAddress))
-        obj_perm.users.add(self.user)
-        queryset = IPAddress.objects.select_related("parent", "nat_inside", "status")
-
-        for permission_constraint in (
-            {"host__family": 4},
-            {"host__net_host": "10.0.0.1"},
-            {"host__net_host_contained": "10.0.0.0/24"},
-            {"host__net_in": ["10.0.0.0/24"]},
-        ):
-            with self.subTest(permission_type=next(iter(permission_constraint.keys()))):
-                try:
-                    with transaction.atomic():
-                        obj_perm.constraints = permission_constraint
-                        obj_perm.save()
-                        list(queryset.restrict(self.user, "view"))
-                finally:
-                    delattr(self.user, "_object_perm_cache")
-
     @skipIf(
         connection.vendor == "postgresql",
         "Not currently supported on postgresql",
@@ -478,20 +454,6 @@ class IPAddressQuerySet(TestCase):
             [instance for ip, instance in self.ips.items() if re.match(r"2001(.*)1", ip)],
         )
 
-    def test_get_or_create(self):
-        # https://github.com/nautobot/nautobot/issues/6676
-        ip_obj, created = IPAddress.objects.update_or_create(
-            defaults={
-                "status": self.ipaddr_status,
-            },
-            host="10.0.0.1",
-            mask_length="24",
-            namespace=self.namespace,
-        )
-        self.assertFalse(created)
-        self.assertEqual(str(ip_obj.address), "10.0.0.1/24")
-        self.assertEqual(ip_obj.parent.namespace, self.namespace)
-
 
 class PrefixQuerysetTestCase(TestCase):
     queryset = Prefix.objects.all()
@@ -686,30 +648,6 @@ class PrefixQuerysetTestCase(TestCase):
         prefix = Prefix.objects.filter(network__net_equals="192.168.0.0/16")[0]
         self.assertEqual(Prefix.objects.filter(prefix="192.168.0.0/16")[0], prefix)
 
-    def test_lookup_not_ambiguous(self):
-        """Check for issues like https://github.com/nautobot/nautobot/issues/5166."""
-        obj_perm = ObjectPermission.objects.create(name="Test Permission", constraints={}, actions=["view"])
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-        obj_perm.users.add(self.user)
-        queryset = Prefix.objects.select_related("parent", "rir", "role", "status", "namespace")
-
-        for permission_constraint in (
-            {"network__family": 4},
-            {"network__net_equals": "192.168.0.0/16"},
-            {"network__net_contained": "192.0.0.0/8"},
-            {"network__net_contained_or_equal": "192.0.0.0/8"},
-            {"network__net_contains": "192.168.3.192/32"},
-            {"network__net_contains_or_equals": "192.168.3.192/32"},
-        ):
-            with self.subTest(permission_type=next(iter(permission_constraint.keys()))):
-                try:
-                    with transaction.atomic():
-                        obj_perm.constraints = permission_constraint
-                        obj_perm.save()
-                        list(queryset.restrict(self.user, "view"))
-                finally:
-                    delattr(self.user, "_object_perm_cache")
-
     @skipIf(
         connection.vendor == "postgresql",
         "Not currently supported on postgresql",

nautobot/ipam/tests/test_views.py

@@ -1054,9 +1054,6 @@ class VLANGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     def get_deletable_object(self):
         return VLANGroup.objects.create(name="TEST DELETE ME")
 
-    def get_deletable_object_pks(self):
-        return [VLANGroup.objects.create(name="TEST DELETE ME").pk]
-
 
 class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VLAN

nautobot/ipam/utils/__init__.py

@@ -1,29 +1,22 @@
-from collections.abc import Iterable
-
 from django.core.exceptions import ValidationError
 import netaddr
 
 from nautobot.core.forms.utils import compress_range
 from nautobot.dcim.models import Interface
 from nautobot.extras.models import RelationshipAssociation
-from nautobot.ipam.choices import PrefixTypeChoices
-from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
+from nautobot.ipam.models import Prefix, VLAN
 from nautobot.ipam.querysets import IPAddressQuerySet
 from nautobot.virtualization.models import VMInterface
 
 
-def add_available_prefixes(parent: netaddr.IPNetwork, namespace: Namespace, prefix_list: Iterable[Prefix]):
+def add_available_prefixes(parent, prefix_list):
     """
     Create fake Prefix objects for all unallocated space within a prefix.
     """
 
     # Find all unallocated space
-    available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet(
-        [p.prefix for p in prefix_list if p.type != PrefixTypeChoices.TYPE_CONTAINER or not p.descendants().exists()]
-    )
-    available_prefixes = [
-        Prefix(prefix=p, namespace=namespace, type=None, status=None) for p in available_prefixes.iter_cidrs()
-    ]
+    available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
+    available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
 
     # Concatenate and sort complete list of children
     prefix_list = list(prefix_list) + available_prefixes
@@ -32,14 +25,7 @@ def add_available_prefixes(parent: netaddr.IPNetwork, namespace: Namespace, pref
     return prefix_list
 
 
-def get_add_available_prefixes_callback(show_available: bool, parent: Prefix):
-    """Conditionally provide a callback for add_available_prefixes()."""
-    if show_available:
-        return lambda prefixes: add_available_prefixes(parent.prefix, parent.namespace, prefixes)
-    return lambda prefixes: prefixes
-
-
-def add_available_ipaddresses(prefix: netaddr.IPNetwork, ipaddress_list: Iterable[IPAddress], is_pool: bool = False):
+def add_available_ipaddresses(prefix, ipaddress_list, is_pool=False):
     """
     Annotate ranges of available IP addresses within a given prefix. If is_pool is True, the first and last IP will be
     considered usable (regardless of mask length).
@@ -95,16 +81,7 @@ def add_available_ipaddresses(prefix: netaddr.IPNetwork, ipaddress_list: Iterabl
     return output
 
 
-def get_add_available_ipaddresses_callback(show_available: bool, parent: Prefix):
-    """Conditionally provide a callback for add_available_ipaddresses()."""
-    if show_available:
-        return lambda ip_addresses: add_available_ipaddresses(
-            parent.prefix, ip_addresses, is_pool=(parent.type == PrefixTypeChoices.TYPE_POOL)
-        )
-    return lambda ip_addresses: ip_addresses
-
-
-def add_available_vlans(vlan_group: VLANGroup, vlans: list[VLAN]):
+def add_available_vlans(vlan_group, vlans):
     """
     Create fake records for all gaps between used VLANs
     """
@@ -122,13 +99,6 @@ def add_available_vlans(vlan_group: VLANGroup, vlans: list[VLAN]):
     return vlans
 
 
-def get_add_available_vlans_callback(show_available: bool, vlan_group: VLANGroup):
-    """Conditionally provide a callback for add_available_vlans()."""
-    if show_available:
-        return lambda vlans: add_available_vlans(vlan_group=vlan_group, vlans=vlans)
-    return lambda vlans: vlans
-
-
 def handle_relationship_changes_when_merging_ips(merged_ip, merged_attributes, collapsed_ips):
     """
     Update/Delete RelationshipAssociation instances after we collapsed the IPs.