diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-11-29 07:05:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-29 07:05:19 +0000 |
| commit | fb5ec9b163e0f92de54a94fa6eac70900fb21055 (patch) | |
| tree | 7c586678caf7320eaca5da0977138d159f430f65 | |
| parent | 1426c12a980f197bc6e092ec5ea7c93974b6bec0 (diff) | |
| parent | ab5936e6abd6eaf738dd5c99190dfe5450560de5 (diff) | |
Merge "Fix vfc-catalog inputs varification"
| -rw-r--r-- | catalog/pub/utils/toscaparser/basemodel.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/catalog/pub/utils/toscaparser/basemodel.py b/catalog/pub/utils/toscaparser/basemodel.py index 8d4c4550..7d2595ad 100644 --- a/catalog/pub/utils/toscaparser/basemodel.py +++ b/catalog/pub/utils/toscaparser/basemodel.py @@ -47,15 +47,22 @@ class BaseInfoModel(object): def _validate_input_params(self, path, params): valid_params = {} - """ + inputs = {} + if isinstance(params, list): + for param in params: + key = param.get('key', 'undefined') + value = param.get('value', 'undefined') + inputs[key] = value + params = inputs + if params and len(params) > 0: tmp = self._create_tosca_template(path, None) - for key, value in params.items(): - if hasattr(tmp, 'inputs') and len(tmp.inputs) > 0: - for input_def in tmp.inputs: - if (input_def.name == key): - valid_params[key] = DataEntityExt.validate_datatype(input_def.type, value) - """ + if isinstance(params, dict): + for key, value in params.items(): + if hasattr(tmp, 'inputs') and len(tmp.inputs) > 0: + for input_def in tmp.inputs: + if (input_def.name == key): + valid_params[key] = DataEntityExt.validate_datatype(input_def.type, value) return valid_params def _create_tosca_template(self, file_name, valid_params): |