[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>

14 files changed, 11 insertions, 492 deletions

diff --git a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level0.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level0.yaml
deleted file mode 100644
index 3e93c1a..0000000
--- a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level0.yaml
+++ /dev/null
@@ -1,50 +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============================================
-#
-#
-# VERSION: '1.0.0'
----
-resources:
-    server_0:
-        type: bad-level1.yaml
-        properties:
-            name: { get_param: server_name_0 }
-    my_resource_group_1:
-        type: OS::Heat::ResourceGroup
-        properties:
-            count: 5
-            resource_def: { type: bad-level2.yaml }
diff --git a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level3.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level3.yaml
deleted file mode 100644
index bdd6131..0000000
--- a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level3.yaml
+++ /dev/null
@@ -1,59 +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============================================
-#
-#
-# VERSION: '1.0.0'
----
-heat_template_version: '2013-05-23'
-
-resources:
-  volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: 1
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: volume }
-      instance_uuid: { get_resource: instance }
-
-  instance:
-    type: OS::Nova::Server
-    properties:
-      image: myimage
-      flavor: m1.small
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_0.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/level0.yaml
index 95d0b77..669cce7 100644
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_0.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/fail/level0.yaml
@@ -40,10 +40,11 @@
 ---
 resources:
     server_0:
-        type: 17528_1.yaml
+        type: level1.yaml
         properties:
             name: { get_param: server_name_0 }
     my_resource_group_1:
         type: OS::Heat::ResourceGroup
         properties:
             count: 5
+            resource_def: { type: level2.yaml }
diff --git a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level1.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/level1.yaml
index e30d89e..821eb13 100644
--- a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level1.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/fail/level1.yaml
@@ -36,7 +36,7 @@
 # ============LICENSE_END============================================
 #
 #
-# VERSION: '1.0.0'
+# VERSION: '1.0.1'
 ---
 nested_template_description: base
 
@@ -48,14 +48,14 @@ parameters:
 
 resources:
     server_0:
-        type: bad-level2.yaml
+        type: level3.yaml
         properties:
             name: {get_param: server_name_0}
     my_resource_group_1:
-        type: OS::Nova::Server
+        type: OS::Heat::ResourceGroup
         properties:
             count: 5
-            resource_def: { type: bad-level3.yaml }
+            resource_def: { type: level2.yaml }
 
 outputs:
     vm_type_volume_id_0:
diff --git a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level2.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/level2.yaml
index 7f56a12..c2f109d 100644
--- a/ice_validator/tests/fixtures/test_nesting_level/fail/bad-level2.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/fail/level2.yaml
@@ -36,7 +36,7 @@
 # ============LICENSE_END============================================
 #
 #
-# VERSION: '1.0.0'
+# VERSION: '1.0.1'
 ---
 nested_template_description: base
 
@@ -55,7 +55,7 @@ resources:
         type: OS::Heat::ResourceGroup
         properties:
             count: 5
-            resource_def: { type: bad-level3.yaml }
+            resource_def: { type: level3.yaml }
 
 outputs:
     vm_type_volume_id_0:
diff --git a/ice_validator/tests/fixtures/test_nesting_level/pass/level3.yaml b/ice_validator/tests/fixtures/test_nesting_level/fail/level3.yaml
index bdd6131..bdd6131 100644
--- a/ice_validator/tests/fixtures/test_nesting_level/pass/level3.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/fail/level3.yaml
diff --git a/ice_validator/tests/fixtures/test_nesting_level/pass/level1.yaml b/ice_validator/tests/fixtures/test_nesting_level/pass/level1.yaml
index 1ca1659..0213649 100644
--- a/ice_validator/tests/fixtures/test_nesting_level/pass/level1.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/pass/level1.yaml
@@ -47,12 +47,8 @@ parameters:
         type: number
 
 resources:
-    server_0:
-        type: level3.yaml
-        properties:
-            name: {get_param: server_name_0}
     my_resource_group_1:
-        type: OS::Nova::Server
+        type: OS::Heat::ResourceGroup
         properties:
             count: 5
             resource_def: { type: level2.yaml }
diff --git a/ice_validator/tests/fixtures/test_nesting_level/pass/level2.yaml b/ice_validator/tests/fixtures/test_nesting_level/pass/level2.yaml
index c2f109d..fce358a 100644
--- a/ice_validator/tests/fixtures/test_nesting_level/pass/level2.yaml
+++ b/ice_validator/tests/fixtures/test_nesting_level/pass/level2.yaml
@@ -35,8 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-#
-# VERSION: '1.0.1'
 ---
 nested_template_description: base
 
@@ -46,17 +44,6 @@ parameters:
     vm_type_volume_size_0:
         type: number
 
-resources:
-    server_0:
-        type: not_a_template_file
-        properties:
-            name: {get_param: server_name_0}
-    my_resource_group_1:
-        type: OS::Heat::ResourceGroup
-        properties:
-            count: 5
-            resource_def: { type: level3.yaml }
-
 outputs:
-    vm_type_volume_id_0:
-        value: {get_resource: vm_type_volume_0}
+    vm_type_volume_name_0:
+        value: {get_param: vm_type_volume_name_0}
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_0.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_0.yaml
deleted file mode 100644
index c5ab87c..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_0.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============================================
-#
-#
-# VERSION: '1.0.0'
----
-resources:
-    server_0:
-        type: bad-17528_1.yaml
-        properties:
-            name: { get_param: server_name_0 }
-    my_resource_group_1:
-        type: OS::Heat::ResourceGroup
-        properties:
-            count: 5
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_1.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_1.yaml
deleted file mode 100644
index c00e1e3..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_1.yaml
+++ /dev/null
@@ -1,64 +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============================================
-#
-#
-# VERSION: '1.0.1'
----
-nested_template_description: base
-
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: not_a_template_file
-        properties:
-            name: {get_param: server_name_0}
-    my_resource_group_1:
-        type: OS::Nova::Server
-        properties:
-            count: 5
-            resource_def: { type: bad-17528_2.yaml }
-    my_resource_group_2:
-        type: OS::Nova::Server
-
-outputs:
-    vm_type_volume_id_0:
-        value: {get_resource: vm_type_volume_0}
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_2.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_2.yaml
deleted file mode 100644
index 7dd2f64..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/fail/bad-17528_2.yaml
+++ /dev/null
@@ -1,59 +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============================================
-#
-#
-# VERSION: '1.0.1'
----
-heat_template_version: '2013-05-23'
-
-resources:
-  volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: 1
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: volume }
-      instance_uuid: { get_resource: instance }
-
-  instance:
-    type: OS::Nova::NotServer
-    properties:
-      image: myimage
-      flavor: m1.small
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_1.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_1.yaml
deleted file mode 100644
index 3e2546f..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_1.yaml
+++ /dev/null
@@ -1,63 +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============================================
-#
-#
-# VERSION: '1.0.0'
----
-nested_template_description: base
-
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: not_a_template_file
-        properties:
-            name: {get_param: server_name_0}
-    my_resource_group_1:
-        type: OS::Nova::Server
-        properties:
-            count: 5
-            #resource_def: { type: 17528_3.yaml }
-            resource_def: { type: 17528_2.yaml }
-
-outputs:
-    vm_type_volume_id_0:
-        value: {get_resource: vm_type_volume_0}
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_2.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_2.yaml
deleted file mode 100644
index 1d17164..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_2.yaml
+++ /dev/null
@@ -1,59 +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============================================
-#
-#
-# VERSION: '1.0.0'
----
-heat_template_version: '2013-05-23'
-
-resources:
-  volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: 1
-
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: volume }
-      instance_uuid: { get_resource: instance }
-
-  instance:
-    type: OS::Nova::NotServer
-    properties:
-      image: myimage
-      flavor: m1.small
diff --git a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_3.yaml b/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_3.yaml
deleted file mode 100644
index a38fd9c..0000000
--- a/ice_validator/tests/fixtures/test_nesting_nova_server/pass/17528_3.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============================================
-#
-#
-# VERSION: '1.0.0'
----
-nested_template_description: base
-
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: not_a_template_file
-        properties:
-            name: {get_param: server_name_0}
-    my_resource_group_1:
-        type: OS::Nova::Server
-        properties:
-            count: 5
-            resource_def: { type: 17528_2.yaml }
-
-outputs:
-    vm_type_volume_id_0:
-        value: {get_resource: vm_type_volume_0}