aboutsummaryrefslogtreecommitdiffstats
path: root/test/conductor
diff options
context:
space:
mode:
authorChayal, Avteet (ac229e) <ac229e@att.com>2020-03-20 00:32:42 -0400
committerChayal, Avteet (ac229e) <ac229e@att.com>2020-03-20 00:39:48 -0400
commitfa538d59b8982a48fd58f024a30a59616d43cf81 (patch)
treebf9df81f09702ab531d46bced9cb8c9811adcd07 /test/conductor
parentfdeaf8b56c8d342ef8145aae15c87525fe105f2a (diff)
Improvements to the OSDF changes for new PEF APIs
Improvements to the OSDF changes for new PEF APIs Issue-ID: OPTFRA-723 Change-Id: Ie425bb302361489f4b5a47fbc7225fdc8060e9c3 Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
Diffstat (limited to 'test/conductor')
-rw-r--r--test/conductor/test_conductor_calls.py4
-rw-r--r--test/conductor/test_conductor_translation.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/conductor/test_conductor_calls.py b/test/conductor/test_conductor_calls.py
index d811e63..52e0367 100644
--- a/test/conductor/test_conductor_calls.py
+++ b/test/conductor/test_conductor_calls.py
@@ -40,12 +40,12 @@ class TestConductorCalls(unittest.TestCase):
def test_request(self):
req_json = json_from_file("./test/placement-tests/request.json")
- policies = pol.get_local_policies("test/policy-local-files/new_policies/", self.lp)
+ policies = pol.get_local_policies("test/policy-local-files/", self.lp)
conductor.request(req_json, self.osdf_config, policies)
def test_request_vfmod(self):
req_json = json_from_file("./test/placement-tests/request_vfmod.json")
- policies = pol.get_local_policies("test/policy-local-files/new_policies/", self.lp)
+ policies = pol.get_local_policies("test/policy-local-files/", self.lp)
conductor.request(req_json, self.osdf_config, policies)
diff --git a/test/conductor/test_conductor_translation.py b/test/conductor/test_conductor_translation.py
index cc9dc1c..3481b88 100644
--- a/test/conductor/test_conductor_translation.py
+++ b/test/conductor/test_conductor_translation.py
@@ -28,7 +28,7 @@ class TestConductorTranslation(unittest.TestCase):
self.main_dir = ""
self.conductor_api_template = self.main_dir + "osdf/templates/conductor_interface.json"
self.local_config_file = self.main_dir + "config/common_config.yaml"
- policy_data_path = self.main_dir + "test/policy-local-files/new_policies"
+ policy_data_path = self.main_dir + "test/policy-local-files"
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)