diff options
| author |   krishnaa96 <krishna.moorthy6@wipro.com> | 2020-03-10 10:55:13 +0530 |
|---|---|---|
| committer | krishnaa96 <krishna.moorthy6@wipro.com> | 2020-03-20 20:39:59 +0530 |
| commit | f30da9513ae0501f453ee93729b381270fad0a2b (patch) | |
| tree | a3ab005e2f16bfe8709bdcfbab6d28b5c6760a19 /test/test_PolicyCalls.py | |
| parent | 420f4b3a4ca25d5de5c9318b2ca89e1ef126b278 (diff) | |
Add generic conductor interface
Issue-ID: OPTFRA-715
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I84218ab65e645a90d2ff1c365bdde1e06ab27d2e
Diffstat (limited to 'test/test_PolicyCalls.py')
| -rw-r--r-- | test/test_PolicyCalls.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/test_PolicyCalls.py b/test/test_PolicyCalls.py index 0b17081..c41c487 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 apps.placement.optimizers.conductor import translation +from osdf.adapters.conductor import translation from osdf.operation.exceptions import BusinessException @@ -101,13 +102,14 @@ class TestPolicyCalls(unittest.TestCase): # need to run this only on vnf policies vnf_policies = [x for x in self.policies if x[list(x.keys())[0]]["type"] == "onap.policies.optimization.VnfPolicy"] - gen_demands = translation.gen_demands(req_json, vnf_policies) + 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") |