[VNFRQTS] update decorator for validation script

update decorator for validation script corresponding to 5.2.1 of VNFRTQS
update decorator for validation script corresponding to 5.2.2 of VNFRTQS

Change-Id: I063e799a27c76bb58c031273aca48031965849d9
Issue-ID: VVP-88
Signed-off-by: stark, steven <ss820f@att.com>

4 files changed, 132 insertions, 4 deletions

diff --git a/ice_validator/tests/fixtures/test_env_no_resource_registry/fail/bad.env b/ice_validator/tests/fixtures/test_env_no_resource_registry/fail/bad.env
new file mode 100644
index 0000000..7be0e88
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_env_no_resource_registry/fail/bad.env
@@ -0,0 +1,65 @@
+# -*- 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'
+
+---
+parameters:
+  KeyName: heat_key
+  InstanceType: m1.micro
+  ImageId: F18-x86_64-cfntools
+
+resource_registry: {} # not allowed
+
+parameter_defaults:
+  default_key: heat_key
+
+encrypted_parameters:
+  g: ""
+
+event_sinks:
+  - type: zaqar-queue
+    target: myqueue
+    ttl: 1200
+
+parameter_merge_strategies:
+  default: merge
+  param1: overwrite
+  param2: deep_merge
diff --git a/ice_validator/tests/fixtures/test_env_no_resource_registry/pass/good.env b/ice_validator/tests/fixtures/test_env_no_resource_registry/pass/good.env
new file mode 100644
index 0000000..44a70dc
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_env_no_resource_registry/pass/good.env
@@ -0,0 +1,63 @@
+# -*- 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'
+
+---
+parameters:
+  KeyName: heat_key
+  InstanceType: m1.micro
+  ImageId: F18-x86_64-cfntools
+
+parameter_defaults:
+  default_key: heat_key
+
+encrypted_parameters:
+  g: ""
+
+event_sinks:
+  - type: zaqar-queue
+    target: myqueue
+    ttl: 1200
+
+parameter_merge_strategies:
+  default: merge
+  param1: overwrite
+  param2: deep_merge
diff --git a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
index d9b1c8b..09ca0b9 100644
--- a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
+++ b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
@@ -39,7 +39,7 @@
 #
 ---
 parameters:
-  a:
+  a!:
     type: string
     label: human-readable name of the parameter
     description: description of the parameter
@@ -50,4 +50,4 @@ parameters:
         description: User name must be between 6 and 8 characters
       - allowed_pattern: "[A-Z]+[a-zA-Z0-9]*"
         description: User name must start with an uppercase character
-    immutable: true
\ No newline at end of file
+    immutable: true
diff --git a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
index 99d8531..4be087d 100644
--- a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
+++ b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
@@ -39,7 +39,7 @@
 #
 ---
 parameters:
-  a:
+  a!:
     type: string
     label: human-readable name of the parameter
     description: description of the parameter
@@ -51,4 +51,4 @@ parameters:
       - allowed_pattern: "[A-Z]+[a-zA-Z0-9]*"
         description: User name must start with an uppercase character
     immutable: true
-    dummy_key: "dummy_key"
\ No newline at end of file
+    dummy_key: "dummy_key"