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
734eb0c8
Commit
734eb0c8
authored
4 years ago
by
Erik Reid
Browse files
Options
Downloads
Patches
Plain Diff
pep8 & typos
parent
a0d581cc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inventory_provider/routes/msr.py
+4
-5
4 additions, 5 deletions
inventory_provider/routes/msr.py
test/test_msr_routes.py
+2
-2
2 additions, 2 deletions
test/test_msr_routes.py
with
6 additions
and
7 deletions
inventory_provider/routes/msr.py
+
4
−
5
View file @
734eb0c8
...
...
@@ -157,7 +157,6 @@ def _handle_peering_group_request(name, cache_key, group_key_base):
if
value
:
yield
from
json
.
loads
(
value
.
decode
(
'
utf-8
'
))
if
name
:
cache_key
=
f
'
{
cache_key
}
:
{
name
}
'
...
...
@@ -196,7 +195,7 @@ def logical_system_peerings(name=None):
logical system if no parameter is given.
:return: see :meth:`inventory_provider.routes.msr._handle_peering_group_request`
"""
"""
# noqa: E501
return
_handle_peering_group_request
(
name
=
name
,
cache_key
=
'
classifier-cache:msr:logical-system-peerings
'
,
...
...
@@ -215,7 +214,7 @@ def bgp_group_peerings(name=None):
logical system if no parameter is given.
:return: see :meth:`inventory_provider.routes.msr._handle_peering_group_request`
"""
"""
# noqa: E501
return
_handle_peering_group_request
(
name
=
name
,
cache_key
=
'
classifier-cache:msr:group-peerings
'
,
...
...
@@ -276,7 +275,7 @@ def get_logical_systems():
information is available.
:return: see :meth:`inventory_provider.routes.msr._handle_peering_group_list_request`
"""
"""
# noqa: E501
return
_handle_peering_group_list_request
(
cache_key
=
'
classifier-cache:msr:logical-systems
'
,
group_key_base
=
'
juniper-peerings:logical-system
'
)
...
...
@@ -292,7 +291,7 @@ def get_peering_groups():
information is available.
:return: see :meth:`inventory_provider.routes.msr._handle_peering_group_list_request`
"""
"""
# noqa: E501
return
_handle_peering_group_list_request
(
cache_key
=
'
classifier-cache:msr:peering-groups
'
,
group_key_base
=
'
juniper-peerings:group
'
)
This diff is collapsed.
Click to expand it.
test/test_msr_routes.py
+
2
−
2
View file @
734eb0c8
...
...
@@ -67,7 +67,7 @@ def test_logical_system_peerings_404(client, name):
def
test_group_peerings_all
(
client
):
rv
=
client
.
get
(
f
'
/msr/bgp/group-peerings
'
,
'
/msr/bgp/group-peerings
'
,
headers
=
DEFAULT_REQUEST_HEADERS
)
assert
rv
.
status_code
==
200
assert
rv
.
is_json
...
...
@@ -92,7 +92,7 @@ def test_group_peerings_specific(client, name):
@pytest.mark.parametrize
(
'
name
'
,
[
'
EGEANT
'
,
'
eGEANT mcast
'
])
def
test_
logical_system
_peerings_404
(
client
,
name
):
def
test_
group
_peerings_404
(
client
,
name
):
rv
=
client
.
get
(
f
'
/msr/bgp/logical-system-peerings/
{
name
}
'
,
headers
=
DEFAULT_REQUEST_HEADERS
)
...
...
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