[VVP] Flag duplicate parameters in .env files

Also some minor tweaks to preload generation so it doesn't fail on
partial heat templates

Change-Id: If39288dde645b0b53a338e7672336807ffa1b6d7
Issue-ID: VVP-284
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>

4 files changed, 57 insertions, 0 deletions

diff --git a/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_env/duplicate.env b/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_env/duplicate.env
new file mode 100644
index 0000000..c159155
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_env/duplicate.env
@@ -0,0 +1,3 @@
+parameters:
+  key: value
+  key: value2
diff --git a/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_heat/good_yaml_eg.yaml b/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_heat/good_yaml_eg.yaml
new file mode 100644
index 0000000..291a8c3
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_initial_configuration/fail/duplicate_heat/good_yaml_eg.yaml
@@ -0,0 +1,52 @@
+# -*- 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: Simple template to deploy a single compute instance
+
+parameters:
+  b:
+    type: string
+    label: Key Name
+    description: Name of key-pair to be used for compute instance
+
+  b:
+    type: string
+    label: Key Name
+    description: Name of key-pair to be used for compute instance
diff --git a/ice_validator/tests/fixtures/test_initial_configuration/fail/fail.yaml b/ice_validator/tests/fixtures/test_initial_configuration/fail/invalid_yaml/fail.yaml
index 1867491..1867491 100644
--- a/ice_validator/tests/fixtures/test_initial_configuration/fail/fail.yaml
+++ b/ice_validator/tests/fixtures/test_initial_configuration/fail/invalid_yaml/fail.yaml
diff --git a/ice_validator/tests/fixtures/test_initial_configuration/pass/good_yaml_eg.env b/ice_validator/tests/fixtures/test_initial_configuration/pass/good_yaml_eg.env
new file mode 100644
index 0000000..d5ecfc7
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_initial_configuration/pass/good_yaml_eg.env
@@ -0,0 +1,2 @@
+parameters:
+  key: value