From f3637436673c64344e9fa6828cb907e8d101bf3e Mon Sep 17 00:00:00 2001 From: shabs2020 Date: Mon, 6 Dec 2021 09:35:52 +0100 Subject: Acumos Adapter updates to support v3 schema Enhanced Adapter to support component spec v3 schema of Istanbul release Additionally corrected config file for no_proxy variable Issue-ID: DCAEGEN2-2877 Signed-off-by: shabs2020 Change-Id: Ie6f2decb6afcd1e164fafab6fd943d6b6c8e7cf0 Signed-off-by: shabs2020 --- .../acumos/tests/fixtures/models/ArgsList_1.0.0_dcae_data_format.json | 2 +- adapter/acumos/tests/fixtures/models/SumOut_1.0.0_dcae_data_format.json | 2 +- .../acumos/tests/fixtures/models/example-model-listofm/metadata.json | 2 +- adapter/acumos/tests/fixtures/models/example-model/requirements.txt | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 adapter/acumos/tests/fixtures/models/example-model/requirements.txt (limited to 'adapter/acumos/tests/fixtures/models') diff --git a/adapter/acumos/tests/fixtures/models/ArgsList_1.0.0_dcae_data_format.json b/adapter/acumos/tests/fixtures/models/ArgsList_1.0.0_dcae_data_format.json index 56b6e6e..ce874e4 100644 --- a/adapter/acumos/tests/fixtures/models/ArgsList_1.0.0_dcae_data_format.json +++ b/adapter/acumos/tests/fixtures/models/ArgsList_1.0.0_dcae_data_format.json @@ -1 +1 @@ -{"self": {"name": "ArgsList", "version": "1.0.0"}, "dataformatversion": "1.0.1", "jsonschema": {"title": "ArgsList", "type": "object", "properties": {"args": {"type": "array", "items": {"$ref": "#/definitions/Args"}}}, "$schema": "http://json-schema.org/draft-04/schema#", "definitions": {"Args": {"title": "Args", "type": "object", "properties": {"x": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}, "y": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}}}}}} \ No newline at end of file +{"self": {"name": "ArgsList", "version": "1.0.0"}, "dataformatversion": "1.0.1", "jsonschema": {"title": "ArgsList", "type": "object", "properties": {"args": {"type": "array", "items": {"$ref": "#/definitions/Args"}}}, "$schema": "http://json-schema.org/draft-04/schema#", "definitions": {"Args": {"title": "Args", "type": "object", "properties": {"x": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}, "y": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}}}}}} diff --git a/adapter/acumos/tests/fixtures/models/SumOut_1.0.0_dcae_data_format.json b/adapter/acumos/tests/fixtures/models/SumOut_1.0.0_dcae_data_format.json index 3f7cdca..fb27276 100644 --- a/adapter/acumos/tests/fixtures/models/SumOut_1.0.0_dcae_data_format.json +++ b/adapter/acumos/tests/fixtures/models/SumOut_1.0.0_dcae_data_format.json @@ -1 +1 @@ -{"self": {"name": "SumOut", "version": "1.0.0"}, "dataformatversion": "1.0.1", "jsonschema": {"title": "SumOut", "type": "object", "properties": {"value": {"type": "array", "items": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}}}, "$schema": "http://json-schema.org/draft-04/schema#", "definitions": {}}} \ No newline at end of file +{"self": {"name": "SumOut", "version": "1.0.0"}, "dataformatversion": "1.0.1", "jsonschema": {"title": "SumOut", "type": "object", "properties": {"value": {"type": "array", "items": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}}}, "$schema": "http://json-schema.org/draft-04/schema#", "definitions": {}}} diff --git a/adapter/acumos/tests/fixtures/models/example-model-listofm/metadata.json b/adapter/acumos/tests/fixtures/models/example-model-listofm/metadata.json index e9df2bd..5826015 100644 --- a/adapter/acumos/tests/fixtures/models/example-model-listofm/metadata.json +++ b/adapter/acumos/tests/fixtures/models/example-model-listofm/metadata.json @@ -1 +1 @@ -{"schema": "acumos.schema.model:0.4.0", "runtime": {"name": "python", "encoding": "protobuf", "version": "3.6.8", "dependencies": {"pip": {"indexes": [], "requirements": [{"name": "dill", "version": "0.3.0"}, {"name": "acumos", "version": "0.8.0"}]}, "conda": {"channels": [], "requirements": []}}}, "name": "example-model", "methods": {"sum": {"input": "ArgsList", "output": "SumOut", "description": ""}}} \ No newline at end of file +{"schema": "acumos.schema.model:0.4.0", "runtime": {"name": "python", "encoding": "protobuf", "version": "3.6.8", "dependencies": {"pip": {"indexes": [], "requirements": [{"name": "dill", "version": "0.3.0"}, {"name": "acumos", "version": "0.8.0"}]}, "conda": {"channels": [], "requirements": []}}}, "name": "example-model", "methods": {"sum": {"input": "ArgsList", "output": "SumOut", "description": ""}}} diff --git a/adapter/acumos/tests/fixtures/models/example-model/requirements.txt b/adapter/acumos/tests/fixtures/models/example-model/requirements.txt new file mode 100644 index 0000000..033b24c --- /dev/null +++ b/adapter/acumos/tests/fixtures/models/example-model/requirements.txt @@ -0,0 +1,2 @@ +dill==0.3.0 +acumos==0.8.0 -- cgit 1.2.3-korg