Skip to content

Commit 493baf2

Browse files
committed
Add support for json-schema to configuration types
See eclipse-cdt-cloud/trace-server-protocol#103 Signed-off-by: Bernd Hufmann <[email protected]>
1 parent 5563c60 commit 493baf2

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

test_tsp.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,9 @@ def test_fetch_configuration_sources(self):
632632
assert response.status_code == 200
633633
assert response.model
634634

635+
assert response.model.parameter_descriptors != None
636+
assert response.model.schema == None
637+
635638
def test_fetch_configurations_none(self):
636639
"""Expect no configurations without posting any."""
637640
response = self.tsp_client.fetch_configurations(CONFIG_SOURCE_TYPE)

tsp/configuration_source.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
DESCTIPION_KEY = "description"
2929
ID_KEY = "id"
3030
PARAM_DESC_KEY = "parameterDescriptors"
31+
SCHEMA_KEY = "schema"
3132

3233

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

63+
self.parameter_descriptors = None
6264
if PARAM_DESC_KEY in params:
6365
# pylint: disable=invalid-name
6466
self.parameter_descriptors = ConfigurationParameterDescriptorSet(params.get(PARAM_DESC_KEY))
67+
params[PARAM_DESC_KEY]
6568

69+
self.schema = None
70+
if SCHEMA_KEY in params:
71+
self.schema = params.get(SCHEMA_KEY)
72+
del params[SCHEMA_KEY]
6673

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

76-
return'Configuration Source[id={0}, name={1}, description: {2}, parameter_descriptor={3}]'.format(self.id,
77-
self.name, self.description, my_str)
83+
my_schema = "no schema"
84+
if self.schema is not None:
85+
my_schema = self.schema
86+
87+
return'Configuration Source[id={0}, name={1}, description: {2}, parameter_descriptor={3}, schema={4}]'.format(self.id,
88+
self.name, self.description, my_str, my_schema)
7889

0 commit comments

Comments
 (0)