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
25c7df16
Commit
25c7df16
authored
2 years ago
by
Erik Reid
Browse files
Options
Downloads
Patches
Plain Diff
placeholder provisioning_proxy service params
parent
c96165a6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geant_service_orchestrator/services/provisioning_proxy.py
+7
-4
7 additions, 4 deletions
geant_service_orchestrator/services/provisioning_proxy.py
geant_service_orchestrator/settings.py
+3
-3
3 additions, 3 deletions
geant_service_orchestrator/settings.py
with
10 additions
and
7 deletions
geant_service_orchestrator/services/provisioning_proxy.py
+
7
−
4
View file @
25c7df16
from
geant_service_orchestrator.products.product_types.device
import
DeviceBlock
from
geant_service_orchestrator
import
settings
import
requests
def
get_api_version
(
oss_params
=
settings
.
ANSIBLEParams
):
def
provision_node
(
node_subscription_params
:
DeviceBlock
,
pp_params
=
settings
.
OSSParams
.
PROVISIONING_PROXY
):
r
=
requests
.
get
(
f
'
{
oss_params
.
host
}
'
f
'
/api/version
'
)
f
'
https://
{
pp_params
.
api_base
}
'
f
'
/api/version
'
,
params
=
node_subscription_params
.
dict
()
)
r
.
raise_for_status
()
...
...
This diff is collapsed.
Click to expand it.
geant_service_orchestrator/settings.py
+
3
−
3
View file @
25c7df16
...
...
@@ -33,8 +33,8 @@ class IPAMParams(BaseSettings):
GEANT_IP
:
ServiceNetworkParams
class
ANSIBLE
Params
(
BaseSettings
):
host
:
str
class
ProvisioningProxy
Params
(
BaseSettings
):
api_base
:
str
auth
:
str
# FIXME: unfinished
api_version
:
int
...
...
@@ -42,7 +42,7 @@ class ANSIBLEParams(BaseSettings):
class
OSSParams
(
BaseSettings
):
IPAM
:
IPAMParams
RESOURCE_MANAGER_API_PREFIX
:
str
# api prefix
ANSIBLE
:
ANSIBLE
Params
PROVISIONING_PROXY
:
ProvisioningProxy
Params
def
load_oss_params
()
->
OSSParams
:
...
...
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