X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=adapter%2Facumos%2Faoconversion%2Fspec_gen.py;h=a08b720db81f67a2da1fecc2a4e26b5f84ee5f59;hb=e5d51b57a83f17a471b69d83c39655c1523b66d6;hp=4230f6d3a768e2f4c84f52dc95fb510da72a230d;hpb=2b2aa9977411519081fcab8ce4d1c37d3d9ee1d4;p=dcaegen2%2Fplatform.git

diff --git a/adapter/acumos/aoconversion/spec_gen.py b/adapter/acumos/aoconversion/spec_gen.py
index 4230f6d..a08b720 100644
--- a/adapter/acumos/aoconversion/spec_gen.py
+++ b/adapter/acumos/aoconversion/spec_gen.py
@@ -1,7 +1,8 @@
 # ============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.
+# 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.
@@ -23,17 +24,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
@@ -70,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,
@@ -80,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),
@@ -103,7 +96,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: