[VVP] Updating test that parameters section must have param

Corresponding change: VNFRQTS-873

Issue-ID: VVP-404
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I38b2053d84525e753418090c7705b15035d375a5

diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_no_valid_keys.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/incremental.yaml
similarity index 95%
rename from ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_no_valid_keys.yaml
rename to ice_validator/tests/fixtures/test_heat_template_structure/fail/incremental.yaml
index 7ca0e39..1877dc7 100644 (file)
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_no_valid_keys.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/fail/incremental.yaml
@@ -34,9 +34,9 @@
 # limitations under the License.
 #
 # ============LICENSE_END============================================
-#
-#
----
-b: 1
-  c: "example"
-d: 100
+parameters:
+
+outputs:
+  a:
+    description: a value
+    value: { get_param: a }

diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/resources/no_resources.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/resources/no_resources.yaml
deleted file mode 100644 (file)
index 2737b4b..0000000
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/resources/no_resources.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-heat_template_version: 2015-04-30
-
-description: test
-
-parameters:
-  a:
-    type: string
-    description: Name of key-pair to be used for compute instance
-
-outputs:
-  a:
-    description: a value
-    value: { get_param: a }

diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yaml
deleted file mode 100644 (file)
index 4a3313f..0000000
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-parameters:
-  b: 1
-    c: "example"
-  d: 100
-
-parameter_defaults:
-  default_key: heat_key
-
-encrypted_parameters:
-  g: ""
-
-event_sinks:
-  - type: zaqar-queue
-    target: myqueue
-    ttl: 1200
-
-parameter_merge_strategies:
-  default: merge
-  param1: overwrite
-  param2: deep_merge
-
-dummy_section:
-  dummy_section: "dummy_value"

diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yml
deleted file mode 100644 (file)
index 4a3313f..0000000
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/structure/non_heat_template_invalid_keys.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-parameters:
-  b: 1
-    c: "example"
-  d: 100
-
-parameter_defaults:
-  default_key: heat_key
-
-encrypted_parameters:
-  g: ""
-
-event_sinks:
-  - type: zaqar-queue
-    target: myqueue
-    ttl: 1200
-
-parameter_merge_strategies:
-  default: merge
-  param1: overwrite
-  param2: deep_merge
-
-dummy_section:
-  dummy_section: "dummy_value"

diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index 3b69faf..1b85dac 100644 (file)
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -68,14 +68,14 @@ def test_heat_template_structure_contains_description(yaml_file):
 
 
 @validates("R-35414")
-def test_heat_template_structure_contains_parameters(heat_template):
+def test_heat_template_structure_contains_parameters(yaml_file):
     """
     Check that all heat templates have the required sections
     """
-    if is_base_module(heat_template):
+    if is_base_module(yaml_file):
         pytest.skip("Not applicable to base modules")
-    template = load_yaml(heat_template)
-    assert "parameters" in template, "This template must contain a parameters section"
+    template = load_yaml(yaml_file)
+    assert "parameters" in template and len(template["parameters"].keys()), "This template must contain a parameters section"
 
 
 @validates("R-23664")