From fc3ead31e631f69fabf0baaa20c10bf955ce374b Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Mon, 8 Apr 2019 15:05:22 +0200 Subject: Traffic Distributtion support added * New local polcies for vFW TD use case * Fixed encoding for conductor_request template and parameters section modified to accept all requestParameters * Conductor request can have many attributes in the 'attributes' section - all that are defined in the vnf policy file * Conductor request can have many request parameters in the 'requestParameters' section. The parameters come from QueryPolicies. Before list of suppoted parameters was hardcoded * Optional 'unique' parameter added to the placementDemand section. It is already supported by conductor for all inventory types * Improved debug logs for local policies * Unit tests added for expanded request format Change-Id: I41f219c366a3a77881c7096e64a6272edbada23b Issue-ID: OPTFRA-443 Signed-off-by: Lukasz Rajewski --- test/test_process_placement_opt.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'test/test_process_placement_opt.py') diff --git a/test/test_process_placement_opt.py b/test/test_process_placement_opt.py index 3219675..62a1ce6 100644 --- a/test/test_process_placement_opt.py +++ b/test/test_process_placement_opt.py @@ -76,6 +76,20 @@ class TestProcessPlacementOpt(unittest.TestCase): local_config = yaml_from_file(local_config_file) templ_string = process_placement_opt(request_json, policies, local_config) + def test_process_placement_opt_placementDemand_vfmodule(self): + main_dir = "" + parameter_data_file = main_dir + "test/placement-tests/request_vfmod.json" + policy_data_path = main_dir + "test/policy-local-files/" + local_config_file = main_dir + "config/common_config.yaml" + + valid_policies_list_file = policy_data_path + '/' + 'meta-valid-policies.txt' + valid_policies_files = local_policies.get_policy_names_from_file(valid_policies_list_file) + + request_json = json_from_file(parameter_data_file) + policies = [json_from_file(policy_data_path + '/' + name) for name in valid_policies_files] + local_config = yaml_from_file(local_config_file) + templ_string = process_placement_opt(request_json, policies, local_config) + if __name__ == "__main__": unittest.main() -- cgit 1.2.3-korg