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
4c900248
Commit
4c900248
authored
1 year ago
by
Robert Latta
Browse files
Options
Downloads
Patches
Plain Diff
added additional search for matching lab routers. RE DBOARD3-888
parent
7dae1962
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
inventory_provider/tasks/worker.py
+8
-1
8 additions, 1 deletion
inventory_provider/tasks/worker.py
with
8 additions
and
1 deletion
inventory_provider/tasks/worker.py
+
8
−
1
View file @
4c900248
...
@@ -461,8 +461,15 @@ def update_entry_point(self):
...
@@ -461,8 +461,15 @@ def update_entry_point(self):
def
_get_router_vendor
(
router
):
def
_get_router_vendor
(
router
):
return
ims_rv
.
get
(
router
.
lower
().
split
(
'
.geant.
'
)[
0
],
'
unknown
'
)
return
ims_rv
.
get
(
router
.
lower
().
split
(
'
.geant.
'
)[
0
],
'
unknown
'
)
def
_get_lab_router_vendor
(
router
):
_rv
=
ims_rv
.
get
(
router
.
lower
().
split
(
'
.geant.
'
)[
0
])
if
not
_rv
:
_rv
=
ims_rv
.
get
(
router
.
lower
().
split
(
'
.office.
'
)[
0
],
'
unknown
'
)
return
_rv
rv
=
{
r
:
_get_router_vendor
(
r
)
for
r
in
routers
}
rv
=
{
r
:
_get_router_vendor
(
r
)
for
r
in
routers
}
lab_rv
=
{
r
:
_get_router_vendor
(
r
)
for
r
in
lab_routers
}
lab_rv
=
{
r
:
_get_
lab_
router_vendor
(
r
)
for
r
in
lab_routers
}
chord
(
chord
(
(
(
ims_task
.
s
().
on_error
(
task_error_handler
.
s
()),
ims_task
.
s
().
on_error
(
task_error_handler
.
s
()),
...
...
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