Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
a9cfc9ae
Commit
a9cfc9ae
authored
Jun 23, 2018
by
Maël Kervella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DNS endpoint SQL optimization
parent
67b492b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
api/serializers.py
api/serializers.py
+2
-1
api/views.py
api/views.py
+8
-1
machines/models.py
machines/models.py
+12
-3
No files found.
api/serializers.py
View file @
a9cfc9ae
...
...
@@ -701,10 +701,11 @@ class CNAMERecordSerializer(serializers.ModelSerializer):
"""
alias
=
serializers
.
CharField
(
source
=
'cname.name'
,
read_only
=
True
)
hostname
=
serializers
.
CharField
(
source
=
'name'
,
read_only
=
True
)
extension
=
serializers
.
CharField
(
source
=
'extension.name'
,
read_only
=
True
)
class
Meta
:
model
=
machines
.
Domain
fields
=
(
'alias'
,
'hostname'
)
fields
=
(
'alias'
,
'hostname'
,
'extension'
)
class
DNSZonesSerializer
(
serializers
.
ModelSerializer
):
...
...
api/views.py
View file @
a9cfc9ae
...
...
@@ -491,7 +491,14 @@ class DNSZonesView(generics.ListAPIView):
"""Exposes the detailed information about each extension (hostnames,
IPs, DNS records, etc.) in order to build the DNS zone files.
"""
queryset
=
machines
.
Extension
.
objects
.
all
()
queryset
=
(
machines
.
Extension
.
objects
.
prefetch_related
(
'soa'
)
.
prefetch_related
(
'ns_set'
).
prefetch_related
(
'ns_set__ns'
)
.
prefetch_related
(
'origin'
)
.
prefetch_related
(
'mx_set'
).
prefetch_related
(
'mx_set__name'
)
.
prefetch_related
(
'txt_set'
)
.
prefetch_related
(
'srv_set'
).
prefetch_related
(
'srv_set__target'
)
.
all
())
serializer_class
=
serializers
.
DNSZonesSerializer
...
...
machines/models.py
View file @
a9cfc9ae
...
...
@@ -563,13 +563,22 @@ class Extension(RevMixin, AclMixin, models.Model):
return
entry
def
get_associated_a_records
(
self
):
return
Interface
.
objects
.
filter
(
type__ip_type__extension
=
self
).
filter
(
ipv4__isnull
=
False
)
return
(
Interface
.
objects
.
filter
(
type__ip_type__extension
=
self
)
.
filter
(
ipv4__isnull
=
False
)
.
prefetch_related
(
'domain'
)
.
prefetch_related
(
'ipv4'
))
def
get_associated_aaaa_records
(
self
):
return
Interface
.
objects
.
filter
(
type__ip_type__extension
=
self
)
return
(
Interface
.
objects
.
filter
(
type__ip_type__extension
=
self
)
.
prefetch_related
(
'domain'
))
def
get_associated_cname_records
(
self
):
return
Domain
.
objects
.
filter
(
extension
=
self
).
filter
(
cname__isnull
=
False
)
return
(
Domain
.
objects
.
filter
(
extension
=
self
)
.
filter
(
cname__isnull
=
False
)
.
prefetch_related
(
'cname'
))
@
staticmethod
def
can_use_all
(
user_request
,
*
_args
,
**
_kwargs
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment