diff options
author | Andrew Gauld <agauld@att.com> | 2020-03-03 20:19:34 +0000 |
---|---|---|
committer | Andrew Gauld <agauld@att.com> | 2020-03-03 20:20:11 +0000 |
commit | c5b41333548353a06374052b2374bc7329d59475 (patch) | |
tree | 4d3c8e41b606d7ead4ce453adba1ca48c45928f6 | |
parent | 14bbfa10adfc928b74ac9fa266c0d91a93067862 (diff) |
Use updated component spec schema
Change-Id: Id1b85a5dd5db03430e28312dcfd35a290a3a6cc6
Issue-ID: DCAEGEN2-2118
Signed-off-by: Andrew Gauld <agauld@att.com>
-rw-r--r-- | adapter/acumos/aoconversion/spec_gen.py | 2 | ||||
-rw-r--r-- | adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json | 60 |
2 files changed, 60 insertions, 2 deletions
diff --git a/adapter/acumos/aoconversion/spec_gen.py b/adapter/acumos/aoconversion/spec_gen.py index 1662872..4230f6d 100644 --- a/adapter/acumos/aoconversion/spec_gen.py +++ b/adapter/acumos/aoconversion/spec_gen.py @@ -29,7 +29,7 @@ from aoconversion import utils def _get_dcae_cs_schema(): res = requests.get( - "https://gerrit.onap.org/r/gitweb?p=dcaegen2/platform/cli.git;a=blob_plain;f=component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json;hb=HEAD" + "https://git.onap.org/dcaegen2/platform/plain/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json" ) return res.json() diff --git a/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json b/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json index 1f1f75e..0fd68ec 100644 --- a/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json +++ b/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json @@ -102,6 +102,36 @@ "items": { "$ref": "#/definitions/artifact" } + }, + "policy_info": { + "type": "object", + "properties": { + "policy": + { + "type": "array", + "items": + { + "type": "object", + "properties": + { + "node_label": + { + "type": "string" + }, + "policy_id": + { + "type": "string" + }, + "policy_model_id": + { + "type": "string" + } + }, + "required": ["node_label", "policy_model_id"] + } + } + }, + "additionalProperties": false } }, "required": [ @@ -740,7 +770,7 @@ "type": "string" } }, - "logging": { + "log_info": { "description": "Component specific details for logging", "type": "object", "properties": { @@ -755,6 +785,34 @@ }, "additionalProperties": false }, + "tls_info": { + "description": "Component information to use tls certificates", + "type": "object", + "properties": { + "cert_directory": { + "description": "The path in the container where the component certificates will be placed by the init container", + "type": "string" + }, + "use_tls": { + "description": "Boolean flag to determine if the application is using tls certificates", + "type": "boolean" + } + }, + "required": [ + "cert_directory","use_tls" + ], + "additionalProperties": false + }, + "databases": { + "description": "The databases the application is connecting to using the pgaas", + "type": "object", + "additionalProperties": { + "type": "string", + "enum": [ + "postgres" + ] + } + }, "policy": { "properties": { "trigger_type": { |