diff options
author | Edyta Krukowska <edyta.krukowska@nokia.com> | 2021-01-21 11:18:16 +0100 |
---|---|---|
committer | Edyta Krukowska <edyta.krukowska@nokia.com> | 2021-01-21 12:30:29 +0100 |
commit | c837fd4f62ca8d468ac48302ff535a024e53e0be (patch) | |
tree | ef9507aa673bd0e9dac8be644895fdf494ebe7d4 /csarvalidation/python/test/test_ActiveRulesTableGenerator.py | |
parent | 398dcd3e75651e047e307a3207fb2b8dc1207ab0 (diff) |
Update documentation and fix path to python test resources
Issue-ID: VNFSDK-731
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: Ie7b045fd55a2192bc90c972e60de58ac5aaa66cc
Diffstat (limited to 'csarvalidation/python/test/test_ActiveRulesTableGenerator.py')
-rw-r--r-- | csarvalidation/python/test/test_ActiveRulesTableGenerator.py | 68 |
1 files changed, 44 insertions, 24 deletions
diff --git a/csarvalidation/python/test/test_ActiveRulesTableGenerator.py b/csarvalidation/python/test/test_ActiveRulesTableGenerator.py index 3103a23..66119e1 100644 --- a/csarvalidation/python/test/test_ActiveRulesTableGenerator.py +++ b/csarvalidation/python/test/test_ActiveRulesTableGenerator.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. @@ -18,20 +18,13 @@ import unittest +import application_configuration +import assertion 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" +from validation.rules.table.ActiveRuleEntity import ActiveRuleEntity +from validation.rules.table.ActiveRulesTable import ActiveRulesTable class ActiveRulesTableGeneratorTest(unittest.TestCase): @@ -40,38 +33,65 @@ class ActiveRulesTableGeneratorTest(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 test_generate_table_with_active_pnf_rules(self): - tables = self.generate_tables_with_active_rules([PNF_REQS_TAG]) + tables = self.generate_tables_with_active_rules([application_configuration.PNF_REQS_TAG]) self.assertTrue(len(tables) == 1) self.validate_csv_table_with_rules(tables[0].get_table_in_csv_format()) def test_generate_table_with_active_vnf_rules(self): - tables = self.generate_tables_with_active_rules([VNF_REQS_TAG]) + tables = self.generate_tables_with_active_rules([application_configuration.VNF_REQS_TAG]) self.assertTrue(len(tables) == 1) self.validate_csv_table_with_rules(tables[0].get_table_in_csv_format()) def test_generate_tables_with_active_vnf_and_pnf_rules(self): - tables = self.generate_tables_with_active_rules([PNF_REQS_TAG, VNF_REQS_TAG]) + tables = self.generate_tables_with_active_rules([application_configuration.PNF_REQS_TAG, + application_configuration.VNF_REQS_TAG]) self.assertTrue(len(tables) == 2) - self.validate_csv_table_with_rules(tables[0].get_table_in_csv_format(values_separator=CSV_DELIMITER)) - self.validate_csv_table_with_rules(tables[1].get_table_in_csv_format(values_separator=CSV_DELIMITER)) + self.validate_csv_table_with_rules(tables[0].get_table_in_csv_format(values_separator= + application_configuration.CSV_DELIMITER)) + self.validate_csv_table_with_rules(tables[1].get_table_in_csv_format(values_separator= + application_configuration.CSV_DELIMITER)) def validate_csv_table_with_rules(self, vnf_rules: str): + releases = application_configuration.get_releases(application_configuration.VNFREWS_PROPERTIES_PATH) lines = vnf_rules.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) + + def test_sort_active_rule_entries_by_release(self): + # given + rule_entries = [ + ActiveRuleEntity(product="onap-vtp", rule="r-1", release="honolulu", description="Some desc"), + ActiveRuleEntity(product="onap-vtp", rule="r-2", release="guilin", description="Some desc"), + ActiveRuleEntity(product="onap-vtp", rule="r-3", release="amsterdam", description="Some desc"), + ActiveRuleEntity(product="onap-vtp", rule="r-4", release="casablanca", description="Some desc"), + ActiveRuleEntity(product="onap-vtp", rule="r-5", release="frankfurt", description="Some desc"), + ActiveRuleEntity(product="onap-vtp", rule="r-6", release="amsterdam", description="Some desc") + ] + + # when + sorted_entries = ActiveRulesTable._sort_by_release(rule_entries) + + # then + self.assertTrue(sorted_entries[0].release == 'amsterdam') + self.assertTrue(sorted_entries[1].release == 'amsterdam') + self.assertTrue(sorted_entries[2].release == 'casablanca') + self.assertTrue(sorted_entries[3].release == 'frankfurt') + self.assertTrue(sorted_entries[4].release == 'guilin') + self.assertTrue(sorted_entries[5].release == 'honolulu') + + if __name__ == '__main__': |