diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2021-01-08 20:41:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-08 20:41:58 +0000 |
| commit | 9013e3e60092977d0ad8ae6dbac79b88964fb952 (patch) | |
| tree | f6ee4990821d60d2fa353a6d8359bfe420f584c0 /adapter/acumos/aoconversion/scanner.py | |
| parent | 88286a3487c3ec955cc6207be2e70318634ebbd9 (diff) | |
| parent | aeabc22ba7e3befc9c19286418c136189b76db37 (diff) | |
Merge "Modify metadata matcher"
Diffstat (limited to 'adapter/acumos/aoconversion/scanner.py')
| -rw-r--r-- | adapter/acumos/aoconversion/scanner.py | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |