[VVP] Misc tweaks and fixes to preload generation

* Use VALUE_FOR if value is still CHANGE me in .env file
* Fix issues with improper parameters being put in VNF parameters in
  the preload
* Fix issue where lists of parameter values pulled from env file could
  only be put in one template
* Exclude platform provided parameters from VNF parameters in preload
* Fixed issues with parameter validations
* Updated heat requirements
* implemented missing test for new requirement that all incremental
  modules must have a nova server

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

1 files changed, 59 insertions, 0 deletions

diff --git a/ice_validator/tests/test_incremental_module.py b/ice_validator/tests/test_incremental_module.py
new file mode 100644
index 0000000..606dfe4
--- /dev/null
+++ b/ice_validator/tests/test_incremental_module.py
@@ -0,0 +1,59 @@
+# -*- 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============================================
+import os
+
+from tests.helpers import validates
+from tests.utils.incrementals import is_incremental_module
+
+from tests.structures import Heat
+
+
+@validates("R-610030")
+def test_incremental_module_has_server(yaml_files):
+    modules = (f for f in yaml_files if is_incremental_module(f, yaml_files))
+    errors = []
+    for module in modules:
+        servers = Heat(filepath=module).get_resource_by_type(
+            "OS::Nova::Server", all_resources=True
+        )
+        if not servers:
+            errors.append(os.path.basename(module))
+
+    assert not errors, (
+        "The following incremental modules do not contain an OS::Nova::Server "
+        "as required: {}".format(", ".join(errors))
+    )