[VVP] Resources not allowed in 2nd level templates 99/100399/1
authorLovett, Trevor <trevor.lovett@att.com>
Thu, 16 Jan 2020 21:47:59 +0000 (15:47 -0600)
committerLovett, Trevor <trevor.lovett@att.com>
Thu, 16 Jan 2020 21:47:59 +0000 (15:47 -0600)
commitded5c74ea07eb1541587de1042444fa6b590ddde
treef59f044962150b4f75d73f90e1ba59e4ff84c69d
parent60d5bfeff163a2155679c9dbece42dc4e085bfd9
[VVP] Resources not allowed in 2nd level templates

Cleaned up nesting detection logic

Deleted test in Nova Server file as the nesting is
no longer related to Nova servers

Added check for resources in 2nd level
nested files to existing test.

Change-Id: I136efb786f67cf4c45fe4da3abaa3fcec024ba50
Issue-ID: VVP-357
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
20 files changed:
ice_validator/heat_requirements.json
ice_validator/tests/fixtures/test_nesting_level/fail/bad-level0.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_level/fail/bad-level3.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_level/fail/level0.yaml [moved from ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_0.yaml with 96% similarity]
ice_validator/tests/fixtures/test_nesting_level/fail/level1.yaml [moved from ice_validator/tests/fixtures/test_nesting_level/fail/bad-level1.yaml with 94% similarity]
ice_validator/tests/fixtures/test_nesting_level/fail/level2.yaml [moved from ice_validator/tests/fixtures/test_nesting_level/fail/bad-level2.yaml with 96% similarity]
ice_validator/tests/fixtures/test_nesting_level/fail/level3.yaml [moved from ice_validator/tests/fixtures/test_nesting_level/pass/level3.yaml with 100% similarity]
ice_validator/tests/fixtures/test_nesting_level/pass/level1.yaml
ice_validator/tests/fixtures/test_nesting_level/pass/level2.yaml
ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_0.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_1.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_2.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_1.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_2.yaml [deleted file]
ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_3.yaml [deleted file]
ice_validator/tests/structures.py
ice_validator/tests/test_environment_file_parameters.py
ice_validator/tests/test_nesting_level.py
ice_validator/tests/test_nesting_nova_server.py [deleted file]
ice_validator/tests/utils/nested_files.py