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
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
339face7
Commit
339face7
authored
1 year ago
by
Erik Reid
Browse files
Options
Downloads
Patches
Plain Diff
Revert "pep8 & styling"
This reverts commit
fadb41db
.
parent
71f8ea58
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
gso/services/resource_manager.py
+11
-5
11 additions, 5 deletions
gso/services/resource_manager.py
test/test_resource_manager.py
+8
-2
8 additions, 2 deletions
test/test_resource_manager.py
with
19 additions
and
7 deletions
gso/services/resource_manager.py
+
11
−
5
View file @
339face7
# mypy: ignore-errors
from
enum
import
Enum
,
auto
from
typing
import
List
from
typing
import
List
,
Set
from
gso
import
settings
...
...
@@ -23,8 +23,11 @@ def _dummy_router_interfaces(site_name) -> dict:
"
physical
"
:
[{
"
name
"
:
f
"
ifc-
{
x
}
"
,
"
state
"
:
InterfaceAllocationState
.
AVAILABLE
}
for
x
in
range
(
250
)],
}
_DUMMY_SITES
=
{
"
site-a
"
,
"
site-b
"
,
"
site-c
"
}
_DUMMY_SITES
=
{
"
site-a
"
,
"
site-b
"
,
"
site-c
"
}
_DUMMY_INVENTORY
=
{
"
fqdn-a
"
:
_dummy_router_interfaces
(
"
site-a
"
),
...
...
@@ -32,7 +35,7 @@ _DUMMY_INVENTORY = {
"
fqdn-c
"
:
_dummy_router_interfaces
(
"
site-b
"
),
"
fqdn-d
"
:
_dummy_router_interfaces
(
"
site-b
"
),
"
fqdn-e
"
:
_dummy_router_interfaces
(
"
site-c
"
),
"
fqdn-f
"
:
_dummy_router_interfaces
(
"
site-c
"
)
,
"
fqdn-f
"
:
_dummy_router_interfaces
(
"
site-c
"
)
}
...
...
@@ -42,7 +45,10 @@ def import_new_site(new_site_name: str, oss_params=settings.OSSParams):
_DUMMY_SITES
.
add
(
new_site_name
)
def
import_new_router
(
new_router_fqdn
:
str
,
site_name
:
str
,
oss_params
=
settings
.
OSSParams
):
def
import_new_router
(
new_router_fqdn
:
str
,
site_name
:
str
,
oss_params
=
settings
.
OSSParams
):
# TODO: this is a dummy implementation
# TODO: specify if this should be an error (and if not, what it means)
...
...
This diff is collapsed.
Click to expand it.
test/test_resource_manager.py
+
8
−
2
View file @
339face7
...
...
@@ -19,18 +19,24 @@ def test_new_site():
def
test_new_router
():
site_name
=
_random_string
(
10
)
resource_manager
.
import_new_site
(
new_site_name
=
site_name
)
router_name
=
_random_string
(
10
)
assert
router_name
not
in
resource_manager
.
_DUMMY_INVENTORY
resource_manager
.
import_new_router
(
new_router_fqdn
=
router_name
,
site_name
=
site_name
)
resource_manager
.
import_new_router
(
new_router_fqdn
=
router_name
,
site_name
=
site_name
)
assert
router_name
in
resource_manager
.
_DUMMY_INVENTORY
def
test_new_lag
():
router_name
=
list
(
resource_manager
.
_DUMMY_INVENTORY
.
keys
())[
0
]
new_lags
=
{
resource_manager
.
next_lag
(
router_fqdn
=
router_name
)
for
_
in
range
(
10
)}
new_lags
=
{
resource_manager
.
next_lag
(
router_fqdn
=
router_name
)
for
_
in
range
(
10
)
}
assert
len
(
new_lags
)
==
10
assert
new_lags
<=
set
(
resource_manager
.
_DUMMY_INVENTORY
[
router_name
][
"
lags
"
])
...
...
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