diff --git a/netbox_dhcp/graphql/schema.py b/netbox_dhcp/graphql/schema.py index 178c352..6d2caab 100644 --- a/netbox_dhcp/graphql/schema.py +++ b/netbox_dhcp/graphql/schema.py @@ -1,4 +1,3 @@ - import strawberry import strawberry_django diff --git a/netbox_dhcp/graphql/types.py b/netbox_dhcp/graphql/types.py index 744c944..25c743f 100644 --- a/netbox_dhcp/graphql/types.py +++ b/netbox_dhcp/graphql/types.py @@ -344,14 +344,29 @@ class NetBoxDHCPOptionType(PrimaryObjectType): send_option: str | None @strawberry_django.field - def assigned_object(self) -> Annotated[ - Annotated["NetBoxDHCPDHCPServerType", strawberry.lazy("netbox_dhcp.graphql.types")] - | Annotated["NetBoxDHCPSubnetType", strawberry.lazy("netbox_dhcp.graphql.types")] - | Annotated["NetBoxDHCPSharedNetworkType", strawberry.lazy("netbox_dhcp.graphql.types")] + def assigned_object( + self, + ) -> Annotated[ + Annotated[ + "NetBoxDHCPDHCPServerType", strawberry.lazy("netbox_dhcp.graphql.types") + ] + | Annotated[ + "NetBoxDHCPSubnetType", strawberry.lazy("netbox_dhcp.graphql.types") + ] + | Annotated[ + "NetBoxDHCPSharedNetworkType", strawberry.lazy("netbox_dhcp.graphql.types") + ] | Annotated["NetBoxDHCPPoolType", strawberry.lazy("netbox_dhcp.graphql.types")] - | Annotated["NetBoxDHCPPDPoolType", strawberry.lazy("netbox_dhcp.graphql.types")] - | Annotated["NetBoxDHCPHostReservationType", strawberry.lazy("netbox_dhcp.graphql.types")] - | Annotated["NetBoxDHCPClientClassType", strawberry.lazy("netbox_dhcp.graphql.types")], + | Annotated[ + "NetBoxDHCPPDPoolType", strawberry.lazy("netbox_dhcp.graphql.types") + ] + | Annotated[ + "NetBoxDHCPHostReservationType", + strawberry.lazy("netbox_dhcp.graphql.types"), + ] + | Annotated[ + "NetBoxDHCPClientClassType", strawberry.lazy("netbox_dhcp.graphql.types") + ], strawberry.union("OptionAssignmentType"), ]: return self.assigned_object diff --git a/netbox_dhcp/migrations/0001_initial.py b/netbox_dhcp/migrations/0001_initial.py index 9c96dd9..f922bf4 100644 --- a/netbox_dhcp/migrations/0001_initial.py +++ b/netbox_dhcp/migrations/0001_initial.py @@ -12,7 +12,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/netbox_dhcp/migrations/0003_optiondefinition_option_definition_standard_or_unique_parent_object_and_more.py b/netbox_dhcp/migrations/0003_optiondefinition_option_definition_standard_or_unique_parent_object_and_more.py index 7f503e1..3c40bd6 100644 --- a/netbox_dhcp/migrations/0003_optiondefinition_option_definition_standard_or_unique_parent_object_and_more.py +++ b/netbox_dhcp/migrations/0003_optiondefinition_option_definition_standard_or_unique_parent_object_and_more.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("extras", "0134_owner"), ("netbox_dhcp", "0002_import_option_definitions"), diff --git a/netbox_dhcp/tests/query_counts.json b/netbox_dhcp/tests/query_counts.json new file mode 100644 index 0000000..a82c1a3 --- /dev/null +++ b/netbox_dhcp/tests/query_counts.json @@ -0,0 +1,22 @@ +{ + "clientclass:api_list_objects": 13, + "clientclass:list_objects_with_permission": 20, + "dhcpcluster:api_list_objects": 12, + "dhcpcluster:list_objects_with_permission": 20, + "dhcpserver:api_list_objects": 17, + "dhcpserver:list_objects_with_permission": 20, + "hostreservation:api_list_objects": 17, + "hostreservation:list_objects_with_permission": 23, + "option:api_list_objects": 16, + "option:list_objects_with_permission": 23, + "optiondefinition:api_list_objects": 12, + "optiondefinition:list_objects_with_permission": 20, + "pdpool:api_list_objects": 17, + "pdpool:list_objects_with_permission": 23, + "pool:api_list_objects": 17, + "pool:list_objects_with_permission": 23, + "sharednetwork:api_list_objects": 18, + "sharednetwork:list_objects_with_permission": 22, + "subnet:api_list_objects": 20, + "subnet:list_objects_with_permission": 21 +} diff --git a/pyproject.toml b/pyproject.toml index b15cec2..0a7f51a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,14 +26,12 @@ Issues = "https://github.com/sys4/netbox-plugin-dhcp/issues" requires = ['setuptools'] build-backend = 'setuptools.build_meta' -[tool.setuptools.packages.find] -exclude = ["examples*", "media*", "*.tests*"] - -[tool.setuptools.package-data] -"netbox_dhcp" = [ - "templates/**/*.html", - "migrations/initial_data/*.json", +[tool.setuptools] +packages = [ + "netbox_dhcp", ] +package-data = { "netbox_dhcp" = ["**/*", "templates/**"] } +exclude-package-data = { "netbox_dhcp" = ["tests/*"] } [tool.ruff] target-version = "py312"