Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GÉANT Service Orchestrator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
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
GÉANT Orchestration and Automation Team
GAP
GÉANT Service Orchestrator
Commits
c234202a
Commit
c234202a
authored
1 year ago
by
Hakan Calim
Browse files
Options
Downloads
Patches
Plain Diff
NAT-329
fied some whitespace issues from ruff
parent
29d89fbc
No related branches found
No related tags found
No related merge requests found
Pipeline
#84753
failed
1 year ago
Stage: tox
Stage: documentation
Stage: sonarqube
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/workflows/iptrunk/test_modify_trunk_interface.py
+13
-13
13 additions, 13 deletions
test/workflows/iptrunk/test_modify_trunk_interface.py
with
13 additions
and
13 deletions
test/workflows/iptrunk/test_modify_trunk_interface.py
+
13
−
13
View file @
c234202a
...
...
@@ -24,31 +24,31 @@ def input_form_iptrunk_data(
nokia_router_subscription_factory
,
iptrunk_side_subscription_factory
,
):
use_juniper
=
getattr
(
request
,
"
param
"
,
UseJuniperSide
.
NONE
)
use_juniper
=
getattr
(
request
,
"
param
"
,
UseJuniperSide
.
NONE
)
if
use_juniper
==
UseJuniperSide
.
SIDE_A
:
side_node
=
juniper_router_subscription_factory
()
side_a_node
=
iptrunk_side_subscription_factory
(
iptrunk_side_node
=
side_node
)
side_b_node
=
iptrunk_side_subscription_factory
()
new_side_a_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_b_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_a_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_b_ae_members
=
faker
.
generate_nokia_members_list
()
elif
use_juniper
==
UseJuniperSide
.
SIDE_B
:
side_node
=
juniper_router_subscription_factory
()
side_a_node
=
iptrunk_side_subscription_factory
()
side_b_node
=
iptrunk_side_subscription_factory
(
iptrunk_side_node
=
side_node
)
new_side_a_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_b_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_a_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_b_ae_members
=
faker
.
generate_junniper_members_list
()
elif
use_juniper
==
UseJuniperSide
.
SIDE_BOTH
:
side_node_1
=
juniper_router_subscription_factory
()
side_node_2
=
juniper_router_subscription_factory
()
side_a_node
=
iptrunk_side_subscription_factory
(
iptrunk_side_node
=
side_node_1
)
side_b_node
=
iptrunk_side_subscription_factory
(
iptrunk_side_node
=
side_node_2
)
new_side_a_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_b_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_a_ae_members
=
faker
.
generate_junniper_members_list
()
new_side_b_ae_members
=
faker
.
generate_junniper_members_list
()
else
:
side_a_node
=
iptrunk_side_subscription_factory
()
side_b_node
=
iptrunk_side_subscription_factory
()
new_side_a_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_b_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_a_ae_members
=
faker
.
generate_nokia_members_list
()
new_side_b_ae_members
=
faker
.
generate_nokia_members_list
()
product_id
=
iptrunk_subscription_factory
(
iptrunk_sides
=
[
side_a_node
,
side_b_node
])
...
...
@@ -150,10 +150,10 @@ def test_iptrunk_modify_trunk_interface_success(
# lag interface for nokia sides
num_lag_ifaces
=
int
(
vendor_side_a
==
RouterVendor
.
NOKIA
)
+
int
(
vendor_side_b
==
RouterVendor
.
NOKIA
)
assert
mocked_reserve_interface
.
call_count
==
num_ifaces
# Only nokia interfaces per side num is randomly generated
assert
mocked_reserve_interface
.
call_count
==
num_ifaces
# Only nokia interfaces per side num is randomly generated
assert
mocked_attach_interface_to_lag
.
call_count
==
num_ifaces
assert
mocked_free_interface
.
call_count
==
num_free_ifaces
# 2 interfaces per nokia side(The old ones)
assert
mocked_detach_interfaces_from_lag
.
call_count
==
num_lag_ifaces
# 1 time per nokia side
assert
mocked_free_interface
.
call_count
==
num_free_ifaces
# 2 interfaces per nokia side(The old ones)
assert
mocked_detach_interfaces_from_lag
.
call_count
==
num_lag_ifaces
# 1 time per nokia side
# Assert all subscription properties have been updated correctly
assert
subscription
.
description
==
f
"
IP trunk, geant_s_sid:
{
new_sid
}
"
...
...
@@ -182,5 +182,5 @@ def test_iptrunk_modify_trunk_interface_success(
for
member
in
subscription
.
iptrunk
.
iptrunk_sides
[
1
].
iptrunk_side_ae_members
:
assert
(
member
.
interface_description
==
_find_interface_by_name
(
new_side_b_ae_members
,
member
.
interface_name
).
interface_description
==
_find_interface_by_name
(
new_side_b_ae_members
,
member
.
interface_name
).
interface_description
)
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