diff options
Diffstat (limited to 'test/test_PolicyCalls.py')
| -rw-r--r-- | test/test_PolicyCalls.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/test_PolicyCalls.py b/test/test_PolicyCalls.py index 4c9366a..1ca14dc 100644 --- a/test/test_PolicyCalls.py +++ b/test/test_PolicyCalls.py @@ -1,5 +1,6 @@ # ------------------------------------------------------------------------- # Copyright (c) 2017-2018 AT&T Intellectual Property +# Copyright (C) 2020 Wipro Limited. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,7 +25,7 @@ from osdf.adapters.policy import interface from osdf.utils.interfaces import RestClient, json_from_file import yaml from mock import patch -from osdf.optimizers.placementopt.conductor import translation +from osdf.adapters.conductor import translation from osdf.operation.exceptions import BusinessException @@ -63,7 +64,7 @@ class TestPolicyCalls(unittest.TestCase): "test/placement-tests/policy_response2.json") with patch('osdf.adapters.policy.interface.policy_api_call', return_value=policy_response): policy_list = interface.remote_api(req_json, osdf_config, service_type="placement") - policy_type = [policy['content']['policyType'] for policy in policy_list] + policy_type = [policy[list(policy.keys())[0]]['type'] for policy in policy_list] #self.assertEqual(set(policy_type), {'hpaPolicy', 'SubscriberPolicy'}) def failure_policy_call(self, req_json_file, resp_json_file): @@ -91,7 +92,7 @@ class TestPolicyCalls(unittest.TestCase): policy_config_file = yaml.load(yaml_file2) with patch('osdf.utils.interfaces.RestClient.request', return_value=req_json_obj2): policies_list = interface.get_by_scope(RestClient, req_json_obj, policy_config_file, 'placement') - self.assertTrue(policies_list, 'is null') + self.assertFalse(policies_list) self.assertRaises(Exception) def test_gen_demands(self): @@ -99,14 +100,16 @@ class TestPolicyCalls(unittest.TestCase): req_json = "./test/placement-tests/request.json" req_json = json.loads(open(req_json).read()) # need to run this only on vnf policies - vnf_policies = [x for x in self.policies if x["content"]["policyType"] == "vnfPolicy"] - gen_demands = translation.gen_demands(req_json, vnf_policies) + vnf_policies = [x for x in self.policies if x[list(x.keys())[0]]["type"] == + "onap.policies.optimization.resource.VnfPolicy"] + gen_demands = translation.gen_demands(req_json['placementInfo']['placementDemands'], vnf_policies) + for action in req_json['placementInfo']['placementDemands']: actions_list.append(action['resourceModuleName']) for key2,value in gen_demands.items(): gen_demands_list.append(key2) self.assertListEqual(gen_demands_list, actions_list, 'generated demands are not equal to the passed input' - '[placementDemand][resourceModuleName] list') + '[placementDemand][resourceModuleName] list') def test_local_policy_location(self): req_json = json_from_file("./test/placement-tests/request.json") |