From aee4f07634d51e8797becd12d95f05f04f2f54cb Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sun, 9 Jul 2023 12:31:40 +0200
Subject: [PATCH] simplified tmp settings
---
gso/oss-params-example.json | 4 +++-
gso/settings.py | 7 ++++++-
test/conftest.py | 4 +++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gso/oss-params-example.json b/gso/oss-params-example.json
index 9c48d63d..cc46f4f5 100644
--- a/gso/oss-params-example.json
+++ b/gso/oss-params-example.json
@@ -2,7 +2,9 @@
"GENERAL": {
"public_hostname": "https://gap.geant.org"
},
- "RESOURCE_MANAGER_API_PREFIX": "http://localhost:44444",
+ "RESOURCE_MANAGEMENT": {
+ "todo": "todo"
+ },
"IPAM": {
"INFOBLOX": {
"scheme": "https",
diff --git a/gso/settings.py b/gso/settings.py
index 88f5dc92..2d527ff1 100644
--- a/gso/settings.py
+++ b/gso/settings.py
@@ -75,12 +75,17 @@ class ProvisioningProxyParams(BaseSettings):
api_version: int
+class ResourceManagementParams(BaseSettings):
+ """TO DO: resource management parameters"""
+ todo: str
+
+
class OSSParams(BaseSettings):
"""The set of parameters required for running GSO."""
GENERAL: GeneralParams
IPAM: IPAMParams
- RESOURCE_MANAGER_API_PREFIX: str
+ RESOURCE_MANAGEMENT: ResourceManagementParams
PROVISIONING_PROXY: ProvisioningProxyParams
diff --git a/test/conftest.py b/test/conftest.py
index a53a4c79..1ef473a1 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -14,7 +14,9 @@ def configuration_data() -> dict:
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
yield {
"GENERAL": {"public_hostname": "https://gap.geant.org"},
- "RESOURCE_MANAGER_API_PREFIX": "http://localhost:44444",
+ "RESOURCE_MANAGEMENT": {
+ 'todo': 'todo'
+ },
"IPAM": {
"INFOBLOX": {
"scheme": "https",
--
GitLab