From 711d4eae913f34e78aa10e8cd511f3b8e43cd54f Mon Sep 17 00:00:00 2001 From: Andrew Gauld Date: Tue, 28 Jul 2020 16:41:43 +0000 Subject: Pull JSON schemas at build/test not run time Change-Id: I4f095a8a80f1c2868319c58bb0e9db916044d067 Issue-ID: DCAEGEN2-2221 Signed-off-by: Andrew Gauld --- adapter/acumos/aoconversion/spec_gen.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'adapter/acumos/aoconversion/spec_gen.py') diff --git a/adapter/acumos/aoconversion/spec_gen.py b/adapter/acumos/aoconversion/spec_gen.py index 4230f6d..8564434 100644 --- a/adapter/acumos/aoconversion/spec_gen.py +++ b/adapter/acumos/aoconversion/spec_gen.py @@ -1,7 +1,7 @@ # ============LICENSE_START==================================================== # org.onap.dcae # ============================================================================= -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019-2020 AT&T Intellectual Property. 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. @@ -23,17 +23,9 @@ Generates DCAE component specs import json from jsonschema import validate -import requests from aoconversion import utils -def _get_dcae_cs_schema(): - res = requests.get( - "https://git.onap.org/dcaegen2/platform/plain/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json" - ) - return res.json() - - def _get_format_version(target_name, data_formats): """ search through the data formats for name, make sure we have it, and retrieve the version @@ -103,7 +95,7 @@ def generate_spec(model_repo_path, model_name, data_formats, docker_uri): Returns the spec """ spec = _generate_spec( - model_name, utils.get_metadata(model_repo_path, model_name), _get_dcae_cs_schema(), data_formats, docker_uri + model_name, utils.get_metadata(model_repo_path, model_name), utils.component_schema.get(), data_formats, docker_uri ) fname = "{0}_dcae_component_specification.json".format(model_name) with open("{0}/{1}".format(model_repo_path, fname), "w") as f: -- cgit 1.2.3-korg