diff options
Diffstat (limited to 'csarvalidation/python/test/test_FileManager.py')
| -rw-r--r-- | csarvalidation/python/test/test_FileManager.py | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/csarvalidation/python/test/test_FileManager.py b/csarvalidation/python/test/test_FileManager.py index 722d1a9..0b6f413 100644 --- a/csarvalidation/python/test/test_FileManager.py +++ b/csarvalidation/python/test/test_FileManager.py @@ -1,7 +1,7 @@ # ============LICENSE_START==================================== # vnfsdk-validation # ========================================================= -# Copyright (C) 2020 Nokia. All rights reserved. +# Copyright (C) 2021 Nokia. All rights reserved. # ========================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,23 +19,14 @@ import os import shutil import unittest +import application_configuration +import assertion from validation.FileManager import FileManager from validation.rules.ActiveRulesTableGenerator import ActiveRulesTableGenerator from validation.rules.providers.ActiveRulesProvider import ActiveRulesProvider from validation.rules.providers.RulesDescriptionsProvider import RulesDescriptionsProvider -RESOURCES_DIRECTORY = '../src/main/resources/' -RULE_DESCRIPTION_SOL001_PATH = RESOURCES_DIRECTORY + 'open-cli-schema/sol001/' -RULE_DESCRIPTION_SOL004_PATH = RESOURCES_DIRECTORY + 'open-cli-schema/sol004/' -VNFREWS_PROPERTIES_PATH = RESOURCES_DIRECTORY + 'vnfreqs.properties' -RULE_DESCRIPTION_FILE_NAME_PATTERN = 'vtp-validate-csar-%s.yaml' - -CSV_DELIMITER = ";" - -VNF_REQS_TAG = "vnfreqs" -PNF_REQS_TAG = "pnfreqs" - OUTPUT_DIRECTORY = './active_rules_table_generator_test/' TABLE_WITH_VNF_RULES = OUTPUT_DIRECTORY + 'VnfActiveRulesTable.csv' @@ -49,21 +40,26 @@ class FileManagerTest(unittest.TestCase): def generate_tables_with_active_rules(requs_tags: list) -> list: return ActiveRulesTableGenerator( [ - RulesDescriptionsProvider(RULE_DESCRIPTION_SOL001_PATH, RULE_DESCRIPTION_FILE_NAME_PATTERN), - RulesDescriptionsProvider(RULE_DESCRIPTION_SOL004_PATH, RULE_DESCRIPTION_FILE_NAME_PATTERN) + RulesDescriptionsProvider(application_configuration.RULE_DESCRIPTION_SOL001_PATH, + application_configuration.RULE_DESCRIPTION_FILE_NAME_PATTERN), + RulesDescriptionsProvider(application_configuration.RULE_DESCRIPTION_SOL004_PATH, + application_configuration.RULE_DESCRIPTION_FILE_NAME_PATTERN) ], - ActiveRulesProvider(VNFREWS_PROPERTIES_PATH) + ActiveRulesProvider(application_configuration.VNFREWS_PROPERTIES_PATH) ).generate_active_validation_rule_tables(requs_tags) def generate_and_save_tables(self): - tables = self.generate_tables_with_active_rules([VNF_REQS_TAG, PNF_REQS_TAG]) + tables = self.generate_tables_with_active_rules([application_configuration.VNF_REQS_TAG, + application_configuration.PNF_REQS_TAG]) file_manager = FileManager(OUTPUT_DIRECTORY) file_manager.save_rule_table( - tables[0].get_table_in_csv_format(values_separator=CSV_DELIMITER), + tables[0].get_table_in_csv_format(values_separator= + application_configuration.CSV_DELIMITER), TABLE_WITH_VNF_RULES ) file_manager.save_rule_table( - tables[1].get_table_in_csv_format(values_separator=CSV_DELIMITER), + tables[1].get_table_in_csv_format(values_separator= + application_configuration.CSV_DELIMITER), TABLE_WITH_PNF_RULES ) @@ -83,12 +79,10 @@ class FileManagerTest(unittest.TestCase): self.validate_csv_table_with_rules(pnf_rules) def validate_csv_table_with_rules(self, vnf_rules): + releases = application_configuration.get_releases(application_configuration.VNFREWS_PROPERTIES_PATH) lines = vnf_rules.read().splitlines() for line in lines: - values = line.split(CSV_DELIMITER) - self.assertTrue(len(values) == 3) - self.assertTrue(values[0].startswith("onap-")) - self.assertTrue(values[1].startswith("r")) + assertion.verify_that_cvc_line_is_valid(self, line, releases, application_configuration.CSV_DELIMITER) if __name__ == '__main__': |