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
b7a8332f
Commit
b7a8332f
authored
11 months ago
by
Karel van Klink
Browse files
Options
Downloads
Patches
Plain Diff
Update fixtures to allow for un-imported varieties
parent
637cb0bb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!213
Add unit tests for imported products
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/fixtures.py
+52
-24
52 additions, 24 deletions
test/fixtures.py
with
52 additions
and
24 deletions
test/fixtures.py
+
52
−
24
View file @
b7a8332f
...
...
@@ -23,11 +23,11 @@ from gso.products.product_blocks.iptrunk import (
)
from
gso.products.product_blocks.router
import
RouterRole
from
gso.products.product_blocks.site
import
SiteTier
from
gso.products.product_types.iptrunk
import
IptrunkInactive
from
gso.products.product_types.office_router
import
OfficeRouterInactive
from
gso.products.product_types.router
import
Router
,
RouterInactive
from
gso.products.product_types.site
import
Site
,
SiteInactive
from
gso.products.product_types.super_pop_switch
import
SuperPopSwitchInactive
from
gso.products.product_types.iptrunk
import
IptrunkInactive
,
ImportedIptrunkInactive
from
gso.products.product_types.office_router
import
OfficeRouterInactive
,
ImportedOfficeRouterInactive
from
gso.products.product_types.router
import
Router
,
RouterInactive
,
ImportedRouterInactive
from
gso.products.product_types.site
import
ImportedSiteInactive
,
Site
,
SiteInactive
from
gso.products.product_types.super_pop_switch
import
SuperPopSwitchInactive
,
ImportedSuperPopSwitchInactive
from
gso.services
import
subscriptions
from
gso.utils.shared_enums
import
Vendor
from
test.workflows
import
WorkflowInstanceForTests
...
...
@@ -50,6 +50,7 @@ def site_subscription_factory(faker, geant_partner):
site_ts_address
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
...
...
@@ -65,8 +66,13 @@ def site_subscription_factory(faker, geant_partner):
site_internal_id
=
site_internal_id
or
faker
.
pyint
()
site_ts_address
=
site_ts_address
or
faker
.
ipv4
()
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
SITE
)
site_subscription
=
SiteInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
SITE
)
site_subscription
=
SiteInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_SITE
)
site_subscription
=
ImportedSiteInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
site_subscription
.
site
.
site_city
=
site_city
site_subscription
.
site
.
site_name
=
site_name
site_subscription
.
site
.
site_country
=
site_country
...
...
@@ -107,6 +113,7 @@ def nokia_router_subscription_factory(site_subscription_factory, faker, geant_pa
router_site
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
...
...
@@ -120,8 +127,13 @@ def nokia_router_subscription_factory(site_subscription_factory, faker, geant_pa
router_lo_iso_address
=
router_lo_iso_address
or
faker
.
word
()
router_site
=
router_site
or
site_subscription_factory
()
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
ROUTER
)
router_subscription
=
RouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
ROUTER
)
router_subscription
=
RouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_ROUTER
)
router_subscription
=
ImportedRouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
router_subscription
.
router
.
router_fqdn
=
router_fqdn
router_subscription
.
router
.
router_ts_port
=
router_ts_port
router_subscription
.
router
.
router_access_via_ts
=
router_access_via_ts
...
...
@@ -162,6 +174,7 @@ def juniper_router_subscription_factory(site_subscription_factory, faker, geant_
router_site
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
...
...
@@ -175,9 +188,13 @@ def juniper_router_subscription_factory(site_subscription_factory, faker, geant_
router_lo_iso_address
=
router_lo_iso_address
or
faker
.
word
()
router_site
=
router_site
or
site_subscription_factory
()
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
ROUTER
)
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
ROUTER
)
router_subscription
=
RouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_ROUTER
)
router_subscription
=
ImportedRouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
router_subscription
=
RouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
router_subscription
.
router
.
router_fqdn
=
router_fqdn
router_subscription
.
router
.
router_ts_port
=
router_ts_port
router_subscription
.
router
.
router_access_via_ts
=
router_access_via_ts
...
...
@@ -256,13 +273,19 @@ def iptrunk_subscription_factory(iptrunk_side_subscription_factory, faker, geant
iptrunk_sides
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IP_TRUNK
)
description
=
description
or
faker
.
sentence
()
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IP_TRUNK
)
iptrunk_subscription
=
IptrunkInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_IP_TRUNK
)
iptrunk_subscription
=
ImportedIptrunkInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
description
=
description
or
faker
.
sentence
()
geant_s_sid
=
geant_s_sid
or
faker
.
geant_sid
()
iptrunk_description
=
iptrunk_description
or
faker
.
sentence
()
iptrunk_isis_metric
=
iptrunk_isis_metric
or
faker
.
pyint
()
...
...
@@ -273,9 +296,6 @@ def iptrunk_subscription_factory(iptrunk_side_subscription_factory, faker, geant
iptrunk_side_b
=
iptrunk_side_subscription_factory
()
iptrunk_sides
=
iptrunk_sides
or
[
iptrunk_side_a
,
iptrunk_side_b
]
iptrunk_subscription
=
IptrunkInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
iptrunk_subscription
.
iptrunk
.
geant_s_sid
=
geant_s_sid
iptrunk_subscription
.
iptrunk
.
iptrunk_description
=
iptrunk_description
iptrunk_subscription
.
iptrunk
.
iptrunk_type
=
iptrunk_type
...
...
@@ -316,6 +336,7 @@ def office_router_subscription_factory(site_subscription_factory, faker, geant_p
office_router_site
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
...
...
@@ -327,10 +348,13 @@ def office_router_subscription_factory(site_subscription_factory, faker, geant_p
office_router_lo_ipv6_address
=
office_router_lo_ipv6_address
or
ipaddress
.
IPv6Address
(
faker
.
ipv6
())
office_router_site
=
office_router_site
or
site_subscription_factory
()
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
OFFICE_ROUTER
)
office_router_subscription
=
OfficeRouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
OFFICE_ROUTER
)
office_router_subscription
=
OfficeRouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_OFFICE_ROUTER
)
office_router_subscription
=
ImportedOfficeRouterInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
office_router_subscription
.
office_router
.
office_router_fqdn
=
office_router_fqdn
office_router_subscription
.
office_router
.
office_router_ts_port
=
office_router_ts_port
office_router_subscription
.
office_router
.
office_router_lo_ipv4_address
=
office_router_lo_ipv4_address
...
...
@@ -366,6 +390,7 @@ def super_pop_switch_subscription_factory(site_subscription_factory, faker, gean
super_pop_switch_site
=
None
,
status
:
SubscriptionLifecycle
|
None
=
None
,
partner
:
dict
|
None
=
None
,
is_imported
:
bool
|
None
=
True
,
)
->
UUIDstr
:
if
partner
is
None
:
partner
=
geant_partner
...
...
@@ -376,10 +401,13 @@ def super_pop_switch_subscription_factory(site_subscription_factory, faker, gean
super_pop_switch_mgmt_ipv4_address
=
super_pop_switch_mgmt_ipv4_address
or
ipaddress
.
IPv4Address
(
faker
.
ipv4
())
super_pop_switch_site
=
super_pop_switch_site
or
site_subscription_factory
()
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
SUPER_POP_SWITCH
)
super_pop_switch_subscription
=
SuperPopSwitchInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
if
is_imported
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
SUPER_POP_SWITCH
)
super_pop_switch_subscription
=
SuperPopSwitchInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
else
:
product_id
=
subscriptions
.
get_product_id_by_name
(
ProductName
.
IMPORTED_SUPER_POP_SWITCH
)
super_pop_switch_subscription
=
ImportedSuperPopSwitchInactive
.
from_product_id
(
product_id
,
customer_id
=
partner
[
"
partner_id
"
],
insync
=
True
)
super_pop_switch_subscription
.
super_pop_switch
.
super_pop_switch_fqdn
=
super_pop_switch_fqdn
super_pop_switch_subscription
.
super_pop_switch
.
super_pop_switch_ts_port
=
super_pop_switch_ts_port
super_pop_switch_subscription
.
super_pop_switch
.
super_pop_switch_mgmt_ipv4_address
=
(
...
...
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