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
76017e87
Commit
76017e87
authored
11 months ago
by
Pelle Koster
Browse files
Options
Downloads
Patches
Plain Diff
DBOARD3-1002: Exclude all logical interfaces from the error report
parent
d7e3a345
No related branches found
No related tags found
1 merge request
!40
DBOARD3-1002: Exclude all logical interfaces from the error report
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
inventory_provider/routes/poller.py
+12
-11
12 additions, 11 deletions
inventory_provider/routes/poller.py
test/test_general_poller_routes.py
+4
-0
4 additions, 0 deletions
test/test_general_poller_routes.py
test/test_worker.py
+2
-8
2 additions, 8 deletions
test/test_worker.py
with
18 additions
and
19 deletions
inventory_provider/routes/poller.py
+
12
−
11
View file @
76017e87
...
...
@@ -931,17 +931,18 @@ def load_error_report_interfaces(
netdash_equipment
=
get_netdash_equipment
(
config
,
use_next_redis
)
def
filter_interface
(
interface
:
dict
):
return
all
(
(
"
phy
"
in
interface
[
"
description
"
].
lower
(),
"
spare
"
not
in
interface
[
"
description
"
].
lower
(),
"
non-operational
"
not
in
interface
[
"
description
"
].
lower
(),
"
reserved
"
not
in
interface
[
"
description
"
].
lower
(),
"
test
"
not
in
interface
[
"
description
"
].
lower
(),
"
dsc.
"
not
in
interface
[
"
name
"
].
lower
(),
"
fxp
"
not
in
interface
[
"
name
"
].
lower
(),
)
)
description
=
interface
[
"
description
"
].
lower
()
name
=
interface
[
"
name
"
].
lower
()
return
(
"
phy
"
in
description
and
"
spare
"
not
in
description
and
"
non-operational
"
not
in
description
and
"
reserved
"
not
in
description
and
"
test
"
not
in
description
and
"
dsc.
"
not
in
name
and
"
fxp
"
not
in
name
and
not
re
.
match
(
r
"
.*\.\d+$
"
,
name
)
)
def
transform_interface
(
interface
:
dict
)
->
Dict
:
return
{
...
...
This diff is collapsed.
Click to expand it.
test/test_general_poller_routes.py
+
4
−
0
View file @
76017e87
...
...
@@ -511,6 +511,10 @@ def test_get_all_error_report_interfaces(client):
response_routers
=
{
ifc
[
'
router
'
]
for
ifc
in
response_data
}
assert
len
(
response_routers
)
>
1
,
'
there should data from be lots of routers
'
def
test_error_report_interfaces_has_no_logical_interfaces
(
client
):
rv
=
client
.
get
(
"
/poller/error-report-interfaces
"
,
headers
=
DEFAULT_REQUEST_HEADERS
)
assert
not
[
i
[
"
name
"
]
for
i
in
rv
.
json
if
i
[
"
name
"
].
endswith
(
"
.1
"
)]
def
test_get_single_router_error_report_interfaces
(
client
):
rv
=
client
.
get
(
...
...
This diff is collapsed.
Click to expand it.
test/test_worker.py
+
2
−
8
View file @
76017e87
...
...
@@ -992,7 +992,7 @@ def test_populate_error_report_interfaces_cache(mocker, data_config, mocked_redi
},
{
"
router
"
:
"
rt0.geant.net
"
,
"
name
"
:
"
lag-1
.0
"
,
"
name
"
:
"
lag-1
"
,
"
bundle
"
:
[
"
ae_c
"
],
"
bundle-parents
"
:
[],
"
description
"
:
"
PHY DESCRIPTION D
"
,
...
...
@@ -1035,12 +1035,6 @@ def test_populate_error_report_interfaces_cache(mocker, data_config, mocked_redi
"
description
"
:
"
PHY DESCRIPTION B
"
,
"
vendor
"
:
"
juniper
"
},
{
"
router
"
:
"
router_a.geant.net
"
,
"
name
"
:
"
ae_a.123
"
,
"
description
"
:
"
PHY DESCRIPTION C
"
,
"
vendor
"
:
"
juniper
"
},
{
"
router
"
:
"
router_a.geant.net
"
,
"
name
"
:
"
interface_a
"
,
...
...
@@ -1051,7 +1045,7 @@ def test_populate_error_report_interfaces_cache(mocker, data_config, mocked_redi
exp_nokia_router_interfaces
=
[
{
"
router
"
:
"
rt0.geant.net
"
,
"
name
"
:
"
lag-1
.0
"
,
"
name
"
:
"
lag-1
"
,
"
description
"
:
"
PHY DESCRIPTION D
"
,
"
vendor
"
:
"
nokia
"
}
...
...
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