Add more link types attempt 2 (#1046)

dgonzdev · amrnator · commit 248d8d4823bb · 2025-10-28T21:40:57.000-04:00
* add new link types

* add migration

* update utils

* update tests

* add unspecified to label

* update migrations

* update constant reference

* add types-python-dateutil to dev dependencies

* fix casing

* fix test map endpoints tests

* fix tests
diff --git a/pyproject.toml b/pyproject.toml
@@ -61,6 +61,7 @@ dev = [
     "flask == 3.0.*",
     "django-cprofile-middleware==1.0.5",
     "django-silk==5.1.0",
+    "types-python-dateutil == 2.9.*",
     "types-requests==2.32.*",
     "types-six==1.16.0.*",
     "django-stubs[compatible-mypy]==5.0.*",
diff --git a/src/meshapi/migrations/0014_alter_historicallink_type_alter_link_type.py b/src/meshapi/migrations/0014_alter_historicallink_type_alter_link_type.py
@@ -0,0 +1,59 @@
+# Generated by Django 4.2.25 on 2025-10-26 15:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meshapi", "0013_historicalnode_placement_node_placement"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicallink",
+            name="type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("5 GHz", "5 GHz Unspecified"),
+                    ("5 GHz Airmax", "5 GHz Airmax"),
+                    ("5 GHz WDS", "5 GHz WDS"),
+                    ("5 GHz Wlan4", "5 GHz Wlan4"),
+                    ("6 GHz", "6 GHz"),
+                    ("24 GHz", "24 GHz"),
+                    ("60 GHz", "60 GHz"),
+                    ("70-80 GHz", "70-80 GHz"),
+                    ("VPN", "VPN"),
+                    ("Fiber", "Fiber"),
+                    ("Ethernet", "Ethernet"),
+                ],
+                default=None,
+                help_text="The technology used for this link 5Ghz, 60Ghz, fiber, etc.",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="link",
+            name="type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("5 GHz", "5 GHz Unspecified"),
+                    ("5 GHz Airmax", "5 GHz Airmax"),
+                    ("5 GHz WDS", "5 GHz WDS"),
+                    ("5 GHz Wlan4", "5 GHz Wlan4"),
+                    ("6 GHz", "6 GHz"),
+                    ("24 GHz", "24 GHz"),
+                    ("60 GHz", "60 GHz"),
+                    ("70-80 GHz", "70-80 GHz"),
+                    ("VPN", "VPN"),
+                    ("Fiber", "Fiber"),
+                    ("Ethernet", "Ethernet"),
+                ],
+                default=None,
+                help_text="The technology used for this link 5Ghz, 60Ghz, fiber, etc.",
+                null=True,
+            ),
+        ),
+    ]
diff --git a/src/meshapi/models/link.py b/src/meshapi/models/link.py
@@ -17,7 +17,10 @@ class LinkStatus(models.TextChoices):
         ACTIVE = "Active"
 
     class LinkType(models.TextChoices):
-        FIVE_GHZ = "5 GHz", "5 GHz"
+        FIVE_GHZ_UNSPECIFIED = "5 GHz", "5 GHz Unspecified"
+        FIVE_GHZ_AIRMAX = "5 GHz Airmax", "5 GHz Airmax"
+        FIVE_GHZ_WDS = "5 GHz WDS", "5 GHz WDS"
+        FIVE_GHZ_WLAN = "5 GHz Wlan4", "5 GHz Wlan4"
         SIX_GHZ = "6 GHz", "6 GHz"
         TWENTYFOUR_GHZ = "24 GHz", "24 GHz"
         SIXTY_GHZ = "60 GHz", "60 GHz"
diff --git a/src/meshapi/tests/test_kml_endpoint.py b/src/meshapi/tests/test_kml_endpoint.py
@@ -110,7 +110,7 @@ def test_kml_data(self):
                 from_device=sn1_omni,
                 to_device=brian_omni,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -128,7 +128,7 @@ def test_kml_data(self):
                 from_device=grand_omni,
                 to_device=random_omni,
                 status=Link.LinkStatus.PLANNED,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -138,7 +138,7 @@ def test_kml_data(self):
                 from_device=dead_omni,
                 to_device=random_omni,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
diff --git a/src/meshapi/tests/test_lookups.py b/src/meshapi/tests/test_lookups.py
@@ -1120,7 +1120,7 @@ def setUp(self):
             from_device=self.d1,
             to_device=self.d2,
             status=Link.LinkStatus.ACTIVE,
-            type=Link.LinkType.FIVE_GHZ,
+            type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             uisp_id="1231",
         )
         self.l1.save()
diff --git a/src/meshapi/tests/test_map_endpoints.py b/src/meshapi/tests/test_map_endpoints.py
@@ -934,7 +934,7 @@ def test_link_data(self):
                 from_device=sn1_omni,
                 to_device=brian_omni,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -954,7 +954,7 @@ def test_link_data(self):
                 from_device=grand_omni,
                 to_device=random_omni,
                 status=Link.LinkStatus.PLANNED,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -964,7 +964,7 @@ def test_link_data(self):
                 from_device=sn1_omni,
                 to_device=random_omni,
                 status=Link.LinkStatus.INACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -974,7 +974,7 @@ def test_link_data(self):
                 from_device=sn1_omni,
                 to_device=inactive_omni,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -1194,7 +1194,7 @@ def test_link_serializer_inactive_link(self):
             from_device=sn1_omni,
             to_device=random_omni,
             status=Link.LinkStatus.INACTIVE,
-            type=Link.LinkType.FIVE_GHZ,
+            type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
         )
 
         self.assertEqual(
@@ -1310,7 +1310,7 @@ def test_links_are_deduplicated(self):
                 from_device=sn1_additional_device,
                 to_device=grand_additional_device,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
         links.append(
@@ -1319,7 +1319,7 @@ def test_links_are_deduplicated(self):
                 from_device=grand2_omni,
                 to_device=grand_omni,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -1539,7 +1539,7 @@ def test_link_install_number_resolution(self):
                 from_device=device_1,
                 to_device=device_2,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -1548,7 +1548,7 @@ def test_link_install_number_resolution(self):
                 from_device=device_2,
                 to_device=device_3,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -1557,7 +1557,7 @@ def test_link_install_number_resolution(self):
                 from_device=device_3,
                 to_device=device_1,
                 status=Link.LinkStatus.ACTIVE,
-                type=Link.LinkType.FIVE_GHZ,
+                type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             )
         )
 
@@ -1682,7 +1682,7 @@ def test_install_number_used_for_links_with_no_nn(self):
             from_device=device1,
             to_device=device2,
             status=Link.LinkStatus.PLANNED,
-            type=Link.LinkType.FIVE_GHZ,
+            type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
         )
         link.save()
         los = LOS(
@@ -1747,7 +1747,7 @@ def test_inactive_duplicate_link_doesnt_hide_active_one(self):
             from_device=device1,
             to_device=device2,
             status=Link.LinkStatus.INACTIVE,
-            type=Link.LinkType.FIVE_GHZ,
+            type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
         )
         link1.save()
 
diff --git a/src/meshapi/tests/test_serializers.py b/src/meshapi/tests/test_serializers.py
@@ -152,7 +152,7 @@ def setUp(self):
             status=Link.LinkStatus.ACTIVE,
             notes="abc def ghi",
             description="xyz abc",
-            type=Link.LinkType.FIVE_GHZ,
+            type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,
             uisp_id="35eecca6-0186-4a33-9837-451de8b12da0",
             install_date=datetime.date(2016, 1, 2),
             abandon_date=datetime.date(2017, 1, 2),
diff --git a/src/meshapi/tests/test_uisp_import.py b/src/meshapi/tests/test_uisp_import.py
diff --git a/src/meshapi/util/uisp_import/utils.py b/src/meshapi/util/uisp_import/utils.py

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ def test_kml_data(self):`
`110`	`110`	`from_device=sn1_omni,`
`111`	`111`	`to_device=brian_omni,`
`112`	`112`	`status=Link.LinkStatus.ACTIVE,`
`113`		`- type=Link.LinkType.FIVE_GHZ,`
	`113`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`114`	`114`	`)`
`115`	`115`	`)`
`116`	`116`
`@@ -128,7 +128,7 @@ def test_kml_data(self):`
`128`	`128`	`from_device=grand_omni,`
`129`	`129`	`to_device=random_omni,`
`130`	`130`	`status=Link.LinkStatus.PLANNED,`
`131`		`- type=Link.LinkType.FIVE_GHZ,`
	`131`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`132`	`132`	`)`
`133`	`133`	`)`
`134`	`134`
`@@ -138,7 +138,7 @@ def test_kml_data(self):`
`138`	`138`	`from_device=dead_omni,`
`139`	`139`	`to_device=random_omni,`
`140`	`140`	`status=Link.LinkStatus.ACTIVE,`
`141`		`- type=Link.LinkType.FIVE_GHZ,`
	`141`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`142`	`142`	`)`
`143`	`143`	`)`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -1120,7 +1120,7 @@ def setUp(self):`
`1120`	`1120`	`from_device=self.d1,`
`1121`	`1121`	`to_device=self.d2,`
`1122`	`1122`	`status=Link.LinkStatus.ACTIVE,`
`1123`		`- type=Link.LinkType.FIVE_GHZ,`
	`1123`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1124`	`1124`	`uisp_id="1231",`
`1125`	`1125`	`)`
`1126`	`1126`	`self.l1.save()`
Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,7 @@ def test_link_data(self):`
`934`	`934`	`from_device=sn1_omni,`
`935`	`935`	`to_device=brian_omni,`
`936`	`936`	`status=Link.LinkStatus.ACTIVE,`
`937`		`- type=Link.LinkType.FIVE_GHZ,`
	`937`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`938`	`938`	`)`
`939`	`939`	`)`
`940`	`940`
`@@ -954,7 +954,7 @@ def test_link_data(self):`
`954`	`954`	`from_device=grand_omni,`
`955`	`955`	`to_device=random_omni,`
`956`	`956`	`status=Link.LinkStatus.PLANNED,`
`957`		`- type=Link.LinkType.FIVE_GHZ,`
	`957`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`958`	`958`	`)`
`959`	`959`	`)`
`960`	`960`
`@@ -964,7 +964,7 @@ def test_link_data(self):`
`964`	`964`	`from_device=sn1_omni,`
`965`	`965`	`to_device=random_omni,`
`966`	`966`	`status=Link.LinkStatus.INACTIVE,`
`967`		`- type=Link.LinkType.FIVE_GHZ,`
	`967`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`968`	`968`	`)`
`969`	`969`	`)`
`970`	`970`
`@@ -974,7 +974,7 @@ def test_link_data(self):`
`974`	`974`	`from_device=sn1_omni,`
`975`	`975`	`to_device=inactive_omni,`
`976`	`976`	`status=Link.LinkStatus.ACTIVE,`
`977`		`- type=Link.LinkType.FIVE_GHZ,`
	`977`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`978`	`978`	`)`
`979`	`979`	`)`
`980`	`980`
`@@ -1194,7 +1194,7 @@ def test_link_serializer_inactive_link(self):`
`1194`	`1194`	`from_device=sn1_omni,`
`1195`	`1195`	`to_device=random_omni,`
`1196`	`1196`	`status=Link.LinkStatus.INACTIVE,`
`1197`		`- type=Link.LinkType.FIVE_GHZ,`
	`1197`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1198`	`1198`	`)`
`1199`	`1199`
`1200`	`1200`	`self.assertEqual(`
`@@ -1310,7 +1310,7 @@ def test_links_are_deduplicated(self):`
`1310`	`1310`	`from_device=sn1_additional_device,`
`1311`	`1311`	`to_device=grand_additional_device,`
`1312`	`1312`	`status=Link.LinkStatus.ACTIVE,`
`1313`		`- type=Link.LinkType.FIVE_GHZ,`
	`1313`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1314`	`1314`	`)`
`1315`	`1315`	`)`
`1316`	`1316`	`links.append(`
`@@ -1319,7 +1319,7 @@ def test_links_are_deduplicated(self):`
`1319`	`1319`	`from_device=grand2_omni,`
`1320`	`1320`	`to_device=grand_omni,`
`1321`	`1321`	`status=Link.LinkStatus.ACTIVE,`
`1322`		`- type=Link.LinkType.FIVE_GHZ,`
	`1322`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1323`	`1323`	`)`
`1324`	`1324`	`)`
`1325`	`1325`
`@@ -1539,7 +1539,7 @@ def test_link_install_number_resolution(self):`
`1539`	`1539`	`from_device=device_1,`
`1540`	`1540`	`to_device=device_2,`
`1541`	`1541`	`status=Link.LinkStatus.ACTIVE,`
`1542`		`- type=Link.LinkType.FIVE_GHZ,`
	`1542`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1543`	`1543`	`)`
`1544`	`1544`	`)`
`1545`	`1545`
`@@ -1548,7 +1548,7 @@ def test_link_install_number_resolution(self):`
`1548`	`1548`	`from_device=device_2,`
`1549`	`1549`	`to_device=device_3,`
`1550`	`1550`	`status=Link.LinkStatus.ACTIVE,`
`1551`		`- type=Link.LinkType.FIVE_GHZ,`
	`1551`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1552`	`1552`	`)`
`1553`	`1553`	`)`
`1554`	`1554`
`@@ -1557,7 +1557,7 @@ def test_link_install_number_resolution(self):`
`1557`	`1557`	`from_device=device_3,`
`1558`	`1558`	`to_device=device_1,`
`1559`	`1559`	`status=Link.LinkStatus.ACTIVE,`
`1560`		`- type=Link.LinkType.FIVE_GHZ,`
	`1560`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1561`	`1561`	`)`
`1562`	`1562`	`)`
`1563`	`1563`
`@@ -1682,7 +1682,7 @@ def test_install_number_used_for_links_with_no_nn(self):`
`1682`	`1682`	`from_device=device1,`
`1683`	`1683`	`to_device=device2,`
`1684`	`1684`	`status=Link.LinkStatus.PLANNED,`
`1685`		`- type=Link.LinkType.FIVE_GHZ,`
	`1685`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1686`	`1686`	`)`
`1687`	`1687`	`link.save()`
`1688`	`1688`	`los = LOS(`
`@@ -1747,7 +1747,7 @@ def test_inactive_duplicate_link_doesnt_hide_active_one(self):`
`1747`	`1747`	`from_device=device1,`
`1748`	`1748`	`to_device=device2,`
`1749`	`1749`	`status=Link.LinkStatus.INACTIVE,`
`1750`		`- type=Link.LinkType.FIVE_GHZ,`
	`1750`	`+ type=Link.LinkType.FIVE_GHZ_UNSPECIFIED,`
`1751`	`1751`	`)`
`1752`	`1752`	`link1.save()`
`1753`	`1753`