[VVP] updating validation scripts in dublin

- adding backlog of new validation scripts for dublin
- updating existing tests
- removing outdated tests

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

2 files changed, 25 insertions, 62 deletions

diff --git a/ice_validator/tests/fixtures/test_nested_parameters/fail/heat_template.yaml b/ice_validator/tests/fixtures/test_nested_parameters/fail/heat_template.yaml
index a6a8a0e..3785474 100644
--- a/ice_validator/tests/fixtures/test_nested_parameters/fail/heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nested_parameters/fail/heat_template.yaml
@@ -48,12 +48,37 @@ parameters:
         type: string
     vm_type_volume_size_0:
         type: number
+    vm_role:
+        type: string
+    vnf_id:
+        type: string
+    vf_module_id:
+        type: string
+    vnf_name:
+        type: string
+    vf_module_name:
+        type: string
+    vf_module_index:
+        type: string
+    environment_context:
+        type: string
+    workload_context:
+        type: string
 
 resources:
     server_0:
         type: nested_template_1.yaml
         properties:
             name: { get_param: server_name_0 }
+            vm_1role: { get_param: vm_role }
+            vnf_1id: { get_param: vnf_id }
+            vf_module_1id: { get_param: vf_module_id }
+            vnf_1name: { get_param: vnf_name }
+            vf_module_1name: { get_param: vf_module_name }
+            vf_module_1index: { get_param: vf_module_index }
+            environment_cont1ext: { get_param: environment_context }
+            workload_cont1ext: { get_param: workload_context }
+    
     my_resource_group_1:
         type: OS::Heat::ResourceGroup
         properties:
diff --git a/ice_validator/tests/fixtures/test_nested_parameters/fail/nested_template_1.yaml b/ice_validator/tests/fixtures/test_nested_parameters/fail/nested_template_1.yaml
deleted file mode 100644
index 5f2732f..0000000
--- a/ice_validator/tests/fixtures/test_nested_parameters/fail/nested_template_1.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============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-
-# 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