diff options
| author |   shabs2020 <shabnam.sultana@highstreet-technologies.com> | 2021-01-07 16:59:48 +0100 |
|---|---|---|
| committer | shabs2020 <shabnam.sultana@highstreet-technologies.com> | 2021-01-07 19:38:24 +0100 |
| commit | aeabc22ba7e3befc9c19286418c136189b76db37 (patch) | |
| tree | caf2d8ca00cff95ff196037af90e7fd518dab56d | |
| parent | a3c8fc0395e9518c5f0f064a033f4ab4d7040c61 (diff) | |
Modify metadata matcher
Add additional condition to check name metadata for correct selection of metadata.json artifact by Acumos adapter
Issue-ID: DCAEGEN2-2578
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>
Change-Id: I76aacd854d1f6c7dff08321e9ecfd030172c07bd
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>
| -rw-r--r-- | adapter/acumos/Changelog.md | 3 | ||||
| -rw-r--r-- | adapter/acumos/aoconversion/scanner.py | 3 | ||||
| -rw-r--r-- | adapter/acumos/pom.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/adapter/acumos/Changelog.md b/adapter/acumos/Changelog.md index 71e5520..73570fd 100644 --- a/adapter/acumos/Changelog.md +++ b/adapter/acumos/Changelog.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). - +## [1.0.4] - 1/07/2021 + * Select metadata.json with additional name search in case of multiple json artifacts (Fix for DCAEGEN2-2578) ## [1.0.3] - 7/28/2020 * Fetch json schemas during image build ## [1.0.2] - 3/26/2020 diff --git a/adapter/acumos/aoconversion/scanner.py b/adapter/acumos/aoconversion/scanner.py index aecf760..cefcc3d 100644 --- a/adapter/acumos/aoconversion/scanner.py +++ b/adapter/acumos/aoconversion/scanner.py @@ -116,7 +116,7 @@ def _x_zip_matcher(art): def _md_json_matcher(art): """ Is this artifact the metadata.json file? """ - return art['name'].endswith('.json') + return art['name'].__contains__('metadata') & art['name'].endswith('.json') def _walk(config): @@ -136,6 +136,7 @@ def _walk(config): def onboard(aa, callback, solution, revid): + xrev = aa.jsonget('/solutions/{}/revisions/{}', solution['solutionId'], revid) callback(model_name=solution['name'], model_version=xrev['version'], model_last_updated=xrev['modified'], rating=solution['ratingAverageTenths'] / 10.0, proto_getter=aa.artgetter(xrev, _x_proto_matcher), zip_getter=aa.artgetter(xrev, _x_zip_matcher), metadata_getter=aa.artgetter(xrev, _md_json_matcher)) diff --git a/adapter/acumos/pom.xml b/adapter/acumos/pom.xml index 20883cf..eda0620 100644 --- a/adapter/acumos/pom.xml +++ b/adapter/acumos/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <groupId>org.onap.dcaegen2.platform.adapter</groupId> <artifactId>dcaegen2-platform-adapter-acumos</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.4-SNAPSHOT</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> |