From 48a07b6942d3956666d30947372653feb702fdae Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Mon, 28 Jan 2019 14:59:01 -0800 Subject: [VVP] stand alone tool, script updates 1) Validation script updates: Various bug fixes and script enhancements New tests for: R-18683 R-94669 R-304011 R-01455 R-86476 R-708564 R-85734 R-18683 R-94669 R-304011 R-01455 R-86476 R-86476 R-589037 Removed tests for: R-75202 R-62954 R-22441 R-49177 R-16576 R-86237 R-44491 R-70757 R-01896 R-26124 2) Stand Alone tool introduced 3) Added optional "categories" capability Change-Id: I193cd5c267750791d97b350e91fc36faa72d8d5f Issue-ID: VVP-143 Signed-off-by: stark, steven --- ice_validator/tests/utils/vm_types.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'ice_validator/tests/utils/vm_types.py') diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py index 78006b9..327b75b 100644 --- a/ice_validator/tests/utils/vm_types.py +++ b/ice_validator/tests/utils/vm_types.py @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # org.onap.vvp/validation-scripts # =================================================================== -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright © 2019 AT&T Intellectual Property. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -39,6 +39,7 @@ # import re +from tests import cached_yaml as yaml def get_vm_types_for_resource(resource): @@ -111,3 +112,20 @@ def get_vm_types(resources): vm_types.extend(list(get_vm_types_for_resource(v))) return set(vm_types) + + +def get_all_vm_types(yaml_files): + """ + Get all vm_types for a list of yaml files + """ + vm_types = [] + for yaml_file in yaml_files: + with open(yaml_file, "r") as f: + yml = yaml.load(f) + + if "resources" not in yml: + continue + + vm_types.extend(get_vm_types(yml["resources"])) + + return set(vm_types) -- cgit 1.2.3-korg