From e5d51b57a83f17a471b69d83c39655c1523b66d6 Mon Sep 17 00:00:00 2001 From: shabs2020 Date: Fri, 4 Jun 2021 12:08:23 +0200 Subject: Adapt DCAE adapter to work with Acumos Demeter's metadata structure change 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 Change-Id: I0f665415d1b3c94e774eec5a56c8df598d222cd3 Signed-off-by: shabs2020 --- adapter/acumos/aoconversion/utils.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'adapter/acumos/aoconversion/utils.py') 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 -- cgit 1.2.3-korg