diff options
author | 2021-06-04 12:08:23 +0200 | |
---|---|---|
committer | 2021-06-08 08:54:13 +0200 | |
commit | e5d51b57a83f17a471b69d83c39655c1523b66d6 (patch) | |
tree | 4edee61686dea44f1c9177598b7ebbf187a5cdfc /adapter/acumos/aoconversion | |
parent | 4a02e289d08e2a9d6203b6e72e2a7c8bd3228070 (diff) |
Adapt DCAE adapter to work with Acumos Demeter's metadata structure change1.0.6-adapter-acumos
Fix the dataformat generation failure due to Demeter's metadata change. At the same maintain its backward compatibility with Acumos Clio.
Issue-ID: DCAEGEN2-2825
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>
Change-Id: I0f665415d1b3c94e774eec5a56c8df598d222cd3
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>
Diffstat (limited to 'adapter/acumos/aoconversion')
-rw-r--r-- | adapter/acumos/aoconversion/dataformat_gen.py | 5 | ||||
-rw-r--r-- | adapter/acumos/aoconversion/spec_gen.py | 5 | ||||
-rw-r--r-- | adapter/acumos/aoconversion/utils.py | 15 |
3 files changed, 21 insertions, 4 deletions
diff --git a/adapter/acumos/aoconversion/dataformat_gen.py b/adapter/acumos/aoconversion/dataformat_gen.py index 71b1617..6701c7c 100644 --- a/adapter/acumos/aoconversion/dataformat_gen.py +++ b/adapter/acumos/aoconversion/dataformat_gen.py @@ -2,6 +2,7 @@ # org.onap.dcae # ============================================================================= # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021 highstreet technologies GmbH. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -54,8 +55,8 @@ def _get_needed_formats(meta): # we use a dict because multiple methods may reuse names needed_formats = {} for method in meta["methods"]: - needed_formats[meta["methods"][method]["input"]] = 1 - needed_formats[meta["methods"][method]["output"]] = 1 + needed_formats[utils.validate_format(meta, method, "input")] = 1 + needed_formats[utils.validate_format(meta, method, "output")] = 1 return list(needed_formats.keys()) diff --git a/adapter/acumos/aoconversion/spec_gen.py b/adapter/acumos/aoconversion/spec_gen.py index 8564434..a08b720 100644 --- a/adapter/acumos/aoconversion/spec_gen.py +++ b/adapter/acumos/aoconversion/spec_gen.py @@ -2,6 +2,7 @@ # org.onap.dcae # ============================================================================= # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021 highstreet technologies GmbH. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -62,7 +63,7 @@ def _generate_spec(model_name, meta, dcae_cs_schema, data_formats, docker_uri): pstype = "message_router" for method in meta["methods"]: - df_in_name = meta["methods"][method]["input"] + df_in_name = utils.validate_format(meta, method, "input") subscriber = { "config_key": "{0}_subscriber".format(method), "format": df_in_name, @@ -72,7 +73,7 @@ def _generate_spec(model_name, meta, dcae_cs_schema, data_formats, docker_uri): spec["streams"]["subscribes"].append(subscriber) - df_out_name = meta["methods"][method]["output"] + df_out_name = utils.validate_format(meta, method, "output") publisher = { "config_key": "{0}_publisher".format(method), diff --git a/adapter/acumos/aoconversion/utils.py b/adapter/acumos/aoconversion/utils.py index 7403505..65c6b95 100644 --- a/adapter/acumos/aoconversion/utils.py +++ b/adapter/acumos/aoconversion/utils.py @@ -2,6 +2,7 @@ # org.onap.dcae # ============================================================================= # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021 highstreet technologies GmbH. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -46,3 +47,17 @@ dataformat_schema = _Schema('schemas/dataformat.json') def get_metadata(model_repo_path, model_name): # for now, assume it's called "metadata.json" return json.loads(open("{0}/{1}/metadata.json".format(model_repo_path, model_name), "r").read()) + + +def validate_format(meta, method, type): + """ + Method to check for the metadata structure of the Acumos Model + due to change in tree structure of the input and output with Acumos-Demeter's release + Solution for Issue id: DCAEGEN2-2825 + """ + try: + df_name = meta["methods"][method][type]["name"] + + except TypeError: + df_name = meta["methods"][method][type] + return df_name |