Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
inventory-provider
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
geant-swd
dashboardv3
inventory-provider
Commits
4a476ec6
Commit
4a476ec6
authored
3 years ago
by
Erik Reid
Browse files
Options
Downloads
Patches
Plain Diff
leave re-raising for later (until we test properly)
parent
b1f6a6ce
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inventory_provider/tasks/worker.py
+6
-4
6 additions, 4 deletions
inventory_provider/tasks/worker.py
test/per_router/test_celery_worker.py
+6
-0
6 additions, 0 deletions
test/per_router/test_celery_worker.py
with
12 additions
and
4 deletions
inventory_provider/tasks/worker.py
+
6
−
4
View file @
4a476ec6
...
@@ -562,12 +562,13 @@ def reload_lab_router_config_chorded(self, hostname):
...
@@ -562,12 +562,13 @@ def reload_lab_router_config_chorded(self, hostname):
hostname
,
community
,
logical_systems
,
self
.
log_info
)
hostname
,
community
,
logical_systems
,
self
.
log_info
)
self
.
log_info
(
f
'
updated configuration for lab
{
hostname
}
'
)
self
.
log_info
(
f
'
updated configuration for lab
{
hostname
}
'
)
except
Exception
as
e
:
except
Exception
:
errmsg
=
f
'
unhandled exception loading
{
hostname
}
info
'
errmsg
=
f
'
unhandled exception loading
{
hostname
}
info
'
logger
.
exception
(
errmsg
)
logger
.
exception
(
errmsg
)
update_latch_status
(
InventoryTask
.
config
,
pending
=
True
,
failure
=
True
)
update_latch_status
(
InventoryTask
.
config
,
pending
=
True
,
failure
=
True
)
self
.
log_error
(
errmsg
)
self
.
log_error
(
errmsg
)
raise
e
# TODO: re-raise and handle in some common way for all tasks
# raise
@app.task
(
base
=
InventoryTask
,
bind
=
True
,
name
=
'
reload_router_config
'
)
@app.task
(
base
=
InventoryTask
,
bind
=
True
,
name
=
'
reload_router_config
'
)
...
@@ -601,12 +602,13 @@ def reload_router_config_chorded(self, hostname):
...
@@ -601,12 +602,13 @@ def reload_router_config_chorded(self, hostname):
snmp_refresh_peerings_chorded
(
hostname
,
community
,
logical_systems
)
snmp_refresh_peerings_chorded
(
hostname
,
community
,
logical_systems
)
logger
.
info
(
f
'
updated configuration for
{
hostname
}
'
)
logger
.
info
(
f
'
updated configuration for
{
hostname
}
'
)
except
Exception
as
e
:
except
Exception
:
errmsg
=
f
'
unhandled exception loading
{
hostname
}
info
'
errmsg
=
f
'
unhandled exception loading
{
hostname
}
info
'
logger
.
exception
(
errmsg
)
logger
.
exception
(
errmsg
)
update_latch_status
(
InventoryTask
.
config
,
pending
=
True
,
failure
=
True
)
update_latch_status
(
InventoryTask
.
config
,
pending
=
True
,
failure
=
True
)
self
.
log_error
(
errmsg
)
self
.
log_error
(
errmsg
)
raise
e
# TODO: re-raise and handle in some common way for all tasks
# raise
def
retrieve_and_persist_netconf_config
(
def
retrieve_and_persist_netconf_config
(
...
...
This diff is collapsed.
Click to expand it.
test/per_router/test_celery_worker.py
+
6
−
0
View file @
4a476ec6
...
@@ -3,6 +3,9 @@ just checks that the worker methods call the right functions
...
@@ -3,6 +3,9 @@ just checks that the worker methods call the right functions
and some data ends up in the right place ... otherwise not very detailed
and some data ends up in the right place ... otherwise not very detailed
"""
"""
import
re
import
re
import
pytest
from
inventory_provider.tasks
import
worker
from
inventory_provider.tasks
import
worker
from
inventory_provider.tasks.common
import
_get_redis
from
inventory_provider.tasks.common
import
_get_redis
...
@@ -18,6 +21,9 @@ def backend_db():
...
@@ -18,6 +21,9 @@ def backend_db():
def
test_netconf_refresh_config
(
mocked_worker_module
,
router
):
def
test_netconf_refresh_config
(
mocked_worker_module
,
router
):
if
router
in
[
'
qfx.par.fr.geant.net
'
,
'
qfx.fra.de.geant.net
'
]:
# expected to fail
pytest
.
skip
(
f
'
test data has no community string for
{
router
}
'
)
del
backend_db
()[
'
netconf:
'
+
router
]
del
backend_db
()[
'
netconf:
'
+
router
]
worker
.
reload_router_config_chorded
(
router
)
worker
.
reload_router_config_chorded
(
router
)
assert
backend_db
()[
'
netconf:
'
+
router
]
assert
backend_db
()[
'
netconf:
'
+
router
]
...
...
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