Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
160649b6
Commit
160649b6
authored
5 years ago
by
Nicolas KAROLAK
Browse files
Options
Downloads
Patches
Plain Diff
fix check_resolver
parent
4adc5c6b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test_dns_records.py
+14
-10
14 additions, 10 deletions
tests/test_dns_records.py
with
14 additions
and
10 deletions
tests/test_dns_records.py
+
14
−
10
View file @
160649b6
...
...
@@ -100,18 +100,22 @@ def check_dns(hostname: str, expected_ip: str, resolvers: set) -> tuple:
return
warnings
,
errors
def
check_resolver
(
conf
:
dict
,
resolvers
:
set
,
ip
:
str
)
->
tuple
:
def
check_resolver
(
conf
:
dict
,
resolvers
:
set
)
->
tuple
:
warnings
=
0
errors
=
0
resolver_set
=
False
for
key
in
(
"
NETWORK_DNS1
"
,
"
NETWORK_DNS2
"
,
"
NETWORK_DNS3
"
):
conf_resolver
=
conf
.
get
(
key
)
if
conf_resolver
:
resolver_set
=
True
if
conf_resolver
not
in
resolvers
:
u
.
warning
(
"
resolver {} not configured
"
.
format
(
conf_resolver
))
warnings
+=
1
else
:
u
.
success
(
"
resolver {} configured
"
)
conf_resolvers_keys
=
(
"
NETWORK_DNS1
"
,
"
NETWORK_DNS2
"
,
"
NETWORK_DNS3
"
)
for
conf_resolver_key
in
conf_resolvers_keys
:
conf_resolver
=
conf
.
get
(
conf_resolver_key
)
if
conf_resolver
and
conf_resolver
not
in
resolvers
:
u
.
warning
(
"
resolver {} not configured
"
.
format
(
conf_resolver
))
warnings
+=
1
if
not
ip
and
(
not
errors
):
if
not
resolver_set
:
u
.
info
(
"
no resolver defined in envsetup configuration, unable to test DNS
"
)
exit
(
2
)
...
...
@@ -131,7 +135,7 @@ def main():
resolvers
=
get_dns_servers
()
ip
=
conf
.
get
(
"
NETWORK_IP_NAT
"
)
or
conf
.
get
(
"
NETWORK_IP
"
)
check_resolver_warn
,
check_resolver_err
=
check_resolver
(
conf
,
resolvers
,
ip
)
check_resolver_warn
,
check_resolver_err
=
check_resolver
(
conf
,
resolvers
)
if
check_resolver_err
:
errors
+=
check_resolver_err
if
check_resolver_warn
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment