diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-03-11 00:51:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-11 00:51:35 +0000 |
| commit | f9242fb6fd592a14b09761dfb58fb7f7e7c56607 (patch) | |
| tree | 80add99f51d10c0d18ee3aa1d01eeeb8d75f5402 /dcae-cli/dcae_cli/catalog/mock/schema.py | |
| parent | ed0e21efa55bce913ccfb9ab6c20333f7fba7605 (diff) | |
| parent | b11dae55f54720759431107e83f1070c10aacd96 (diff) | |
Merge "Make tox work in a fresh scenario"
Diffstat (limited to 'dcae-cli/dcae_cli/catalog/mock/schema.py')
| -rw-r--r-- | dcae-cli/dcae_cli/catalog/mock/schema.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dcae-cli/dcae_cli/catalog/mock/schema.py b/dcae-cli/dcae_cli/catalog/mock/schema.py index a27346b..640d125 100644 --- a/dcae-cli/dcae_cli/catalog/mock/schema.py +++ b/dcae-cli/dcae_cli/catalog/mock/schema.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 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. @@ -110,8 +110,6 @@ def _validate(fetch_schema_func, schema_path, spec): _validate_using_nexus = partial(_validate, _fetch_schema) -_path_component_spec = cli_config.get_path_component_spec() - def apply_defaults(properties_definition, properties): """Utility method to enforce expected defaults @@ -159,7 +157,7 @@ def apply_defaults_docker_config(config): """ # Apply health check defaults healthcheck_type = config["healthcheck"]["type"] - component_spec = _fetch_schema(_path_component_spec) + component_spec = _fetch_schema(cli_config.get_path_component_spec()) if healthcheck_type in ["http", "https"]: apply_defaults_func = partial(apply_defaults, @@ -176,7 +174,7 @@ def apply_defaults_docker_config(config): return config def validate_component(spec): - _validate_using_nexus(_path_component_spec, spec) + _validate_using_nexus(cli_config.get_path_component_spec(), spec) # REVIEW: Could not determine how to do this nicely in json schema. This is # not ideal. We want json schema to be the "it" for validation. |