Skip to content

Commit

Permalink
Add support for json-schema to configuration types
Browse files Browse the repository at this point in the history
  • Loading branch information
bhufmann committed Oct 17, 2024
1 parent 5563c60 commit 493baf2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
3 changes: 3 additions & 0 deletions test_tsp.py
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,9 @@ def test_fetch_configuration_sources(self):
assert response.status_code == 200
assert response.model

assert response.model.parameter_descriptors != None
assert response.model.schema == None

def test_fetch_configurations_none(self):
"""Expect no configurations without posting any."""
response = self.tsp_client.fetch_configurations(CONFIG_SOURCE_TYPE)
Expand Down
15 changes: 13 additions & 2 deletions tsp/configuration_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
DESCTIPION_KEY = "description"
ID_KEY = "id"
PARAM_DESC_KEY = "parameterDescriptors"
SCHEMA_KEY = "schema"


# pylint: disable=too-few-public-methods
Expand Down Expand Up @@ -59,10 +60,16 @@ def __init__(self, params):
else:
self.id = "unknown-id"

self.parameter_descriptors = None
if PARAM_DESC_KEY in params:
# pylint: disable=invalid-name
self.parameter_descriptors = ConfigurationParameterDescriptorSet(params.get(PARAM_DESC_KEY))
params[PARAM_DESC_KEY]

self.schema = None
if SCHEMA_KEY in params:
self.schema = params.get(SCHEMA_KEY)
del params[SCHEMA_KEY]

# pylint: disable=consider-using-f-string
def to_string(self):
Expand All @@ -73,6 +80,10 @@ def to_string(self):
if self.parameter_descriptors is not None:
my_str = self.parameter_descriptors.to_string()

return'Configuration Source[id={0}, name={1}, description: {2}, parameter_descriptor={3}]'.format(self.id,
self.name, self.description, my_str)
my_schema = "no schema"
if self.schema is not None:
my_schema = self.schema

return'Configuration Source[id={0}, name={1}, description: {2}, parameter_descriptor={3}, schema={4}]'.format(self.id,
self.name, self.description, my_str, my_schema)

0 comments on commit 493baf2

Please sign in to comment.