Fix and additional tests for "Renumber IP Space" tool (#532) (#563)

peeringdb_server/management/commands/pdb_renumber_lans.py

@@ -42,8 +42,8 @@ class Command(BaseCommand):
             self.log("[error] {}".format("New prefix needs to be of same " \
                                          "protocol as old prefix"))
 
-        prefixes = IXLanPrefix.objects.filter(prefix=old, ixlan__ix_id=self.ix)
+        prefixes = IXLanPrefix.objects.filter(prefix=old, ixlan__ix_id=self.ix, status="ok")
-        netixlans = NetworkIXLan.objects.filter(ixlan__ix_id=self.ix)
+        netixlans = NetworkIXLan.objects.filter(ixlan__ix_id=self.ix, status="ok")
 
         if self.ixlan:
             self.log("Only replacing in ixlan {}".format(self.ixlan.descriptive_name))
@@ -59,7 +59,13 @@ class Command(BaseCommand):
 
         for netixlan in netixlans:
             old_addr = netixlan.ipaddr(old_prefix.version)
+
+            try:
                 new_addr = renumber_ipaddress(old_addr, old_prefix, new_prefix)
+            except Exception as exc:
+                self.log("[error] {}: {}".format(old_addr, exc))
+                continue
+
             self.log("Renumbering {} -> {}".format(
                 netixlan.descriptive_name_ipv(new_addr.version), new_addr))
 

tests/test_cmd_renumber_lans.py

@@ -9,28 +9,22 @@ from django.conf import settings
 from peeringdb_server.models import REFTAG_MAP
 
 
-class TestWipe(ClientCase):
+class TestRenumberLans(ClientCase):
 
     @classmethod
     def setUpTestData(cls):
-        super(TestWipe, cls).setUpTestData()
+        super(TestRenumberLans, cls).setUpTestData()
         call_command("pdb_generate_test_data", limit=1, commit=True)
 
     def test_run(self):
+        """
+        test a successful execution of the `pdb_renumber_lans` command
+        """
+
         ix = REFTAG_MAP["ix"].objects.all().first()
 
         ixlan = ix.ixlan_set_active.all().first()
 
-        for ixpfx in ixlan.ixpfx_set.all():
-            print(ixpfx.descriptive_name)
-
-        for netixlan in ixlan.netixlan_set.all():
-            print(netixlan.descriptive_name)
-
-        #ixpfx1 206.223.116.0/23
-        #ixpfx2 2001:504:0:1::/64
-        #netixlan1 AS63314 206.223.116.101 2001:504:0:1::65
-
         call_command("pdb_renumber_lans", ix=1, old=u"206.223.116.0/23", new=u"206.223.110.0/23", commit=True)
 
         assert ixlan.ixpfx_set.get(id=1).prefix.compressed == u"206.223.110.0/23"
@@ -42,3 +36,65 @@ class TestWipe(ClientCase):
         assert ixlan.netixlan_set.get(id=1).ipaddr6.compressed == u"2001:504:0:2::65"
 
 
+    def test_skip_deleted(self):
+        """
+        test that `pdb_renumber_lans` command skips deleted prefixes and
+        netixlans
+        """
+
+        ix = REFTAG_MAP["ix"].objects.all().first()
+
+        ixlan = ix.ixlan_set_active.all().first()
+
+        for ixpfx in ixlan.ixpfx_set.all():
+            ixpfx.delete()
+
+        for netixlan in ixlan.netixlan_set.all():
+            netixlan.delete()
+
+
+        call_command("pdb_renumber_lans", ix=1, old=u"206.223.116.0/23", new=u"206.223.110.0/23", commit=True)
+
+        assert ixlan.ixpfx_set.get(id=1).prefix.compressed == u"206.223.116.0/23"
+        assert ixlan.netixlan_set.get(id=1).ipaddr4.compressed == u"206.223.116.101"
+
+        call_command("pdb_renumber_lans", ix=1, old=u"2001:504:0:1::/64", new=u"2001:504:0:2::/64", commit=True)
+
+        assert ixlan.ixpfx_set.get(id=2).prefix.compressed == u"2001:504:0:1::/64"
+        assert ixlan.netixlan_set.get(id=1).ipaddr6.compressed == u"2001:504:0:1::65"
+
+
+
+    def test_ignore_diff_address_space(self):
+        """"
+        Test that `pdb_renumber_lans` command soft errors on netixlans that
+        arent in the specified address space (but exist on the ixlan)
+        """
+
+        ix = REFTAG_MAP["ix"].objects.all().first()
+
+        ixlan = ix.ixlan_set_active.all().first()
+
+        out = StringIO.StringIO()
+
+        call_command("pdb_renumber_lans", ix=1, old=u"206.223.114.0/23",
+                     new=u"206.223.110.0/23", commit=True, stdout=out)
+
+        assert ixlan.ixpfx_set.get(id=1).prefix.compressed == u"206.223.116.0/23"
+        assert ixlan.netixlan_set.get(id=1).ipaddr4.compressed == u"206.223.116.101"
+
+        output = out.getvalue()
+        assert output.find("[error] 206.223.116.101: Ip address not within old prefix") > -1
+
+        call_command("pdb_renumber_lans", ix=1, old=u"2001:504:0:3::/64",
+                     new=u"2001:504:0:2::/64", commit=True, stdout=out)
+
+        assert ixlan.ixpfx_set.get(id=2).prefix.compressed == u"2001:504:0:1::/64"
+        assert ixlan.netixlan_set.get(id=1).ipaddr6.compressed == u"2001:504:0:1::65"
+
+        output = out.getvalue()
+
+        assert output.find("[error] 2001:504:0:1::65: Ip address not within old prefix") > -1
+
+
+