From 25c7df1673eaec8a260795c57c0ef1527fcc0a08 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sat, 8 Apr 2023 15:01:38 +0200
Subject: [PATCH] placeholder provisioning_proxy service params
---
.../services/provisioning_proxy.py | 11 +++++++----
geant_service_orchestrator/settings.py | 6 +++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/geant_service_orchestrator/services/provisioning_proxy.py b/geant_service_orchestrator/services/provisioning_proxy.py
index c34c20cd..5770bab1 100644
--- a/geant_service_orchestrator/services/provisioning_proxy.py
+++ b/geant_service_orchestrator/services/provisioning_proxy.py
@@ -1,12 +1,15 @@
+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()
diff --git a/geant_service_orchestrator/settings.py b/geant_service_orchestrator/settings.py
index bb586da6..0846e5f2 100644
--- a/geant_service_orchestrator/settings.py
+++ b/geant_service_orchestrator/settings.py
@@ -33,8 +33,8 @@ class IPAMParams(BaseSettings):
GEANT_IP: ServiceNetworkParams
-class ANSIBLEParams(BaseSettings):
- host: str
+class ProvisioningProxyParams(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: ANSIBLEParams
+ PROVISIONING_PROXY: ProvisioningProxyParams
def load_oss_params() -> OSSParams:
--
GitLab