Skip to content

Commit 7c2bddc

Browse files
authored
Merge pull request #41 from sys4/feature/netbox-4.6
Adjustments for compatibility with NetBox 4.6-beta1
2 parents e9ba2c8 + 65ab1cd commit 7c2bddc

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

netbox_dhcp/api/serializers_/dhcp_server.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ class Meta:
143143
many=True,
144144
read_only=False,
145145
required=False,
146-
default=None,
147146
help_text=_("Interfaces"),
148147
)
149148
virtual_machine = VirtualMachineSerializer(
@@ -158,15 +157,13 @@ class Meta:
158157
many=True,
159158
read_only=False,
160159
required=False,
161-
default=None,
162160
help_text=_("Virtual Interfaces"),
163161
)
164162
interfaces = DHCPServerInterfaceSerializer(
165163
nested=True,
166164
many=True,
167165
read_only=True,
168166
required=False,
169-
default=None,
170167
help_text=_("Interfaces"),
171168
)
172169

netbox_dhcp/fields/ip_address.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ def as_sql(self, qn, connection):
1010
lhs, lhs_params = self.process_lhs(qn, connection)
1111
rhs, rhs_params = self.process_rhs(qn, connection)
1212

13+
rhs_params = list(rhs_params)
1314
if rhs_params:
1415
rhs_params[0] = rhs_params[0].split("/")[0]
1516

16-
params = lhs_params + rhs_params
17+
params = list(lhs_params) + rhs_params
1718
return f"CAST(HOST({lhs}) AS INET) <= CAST({rhs} AS INET)", params
1819

1920

@@ -24,10 +25,11 @@ def as_sql(self, qn, connection):
2425
lhs, lhs_params = self.process_lhs(qn, connection)
2526
rhs, rhs_params = self.process_rhs(qn, connection)
2627

28+
rhs_params = list(rhs_params)
2729
if rhs_params:
2830
rhs_params[0] = rhs_params[0].split("/")[0]
2931

30-
params = lhs_params + rhs_params
32+
params = list(lhs_params) + rhs_params
3133
return f"CAST(HOST({lhs}) AS INET) >= CAST({rhs} AS INET)", params
3234

3335

0 commit comments

Comments
 (0)