update link to upper-constraints.txt

[optf/osdf.git] / test / test_get_opt_query_data.py

diff --git a/test/test_get_opt_query_data.py b/test/test_get_opt_query_data.py
index 06dfbf9..8e6c324 100644 (file)
--- a/test/test_get_opt_query_data.py
+++ b/test/test_get_opt_query_data.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.
@@ -17,7 +18,7 @@
 #
 import unittest
 import json
-from apps.placement.optimizers.conductor.translation import get_opt_query_data
+from osdf.adapters.conductor.translation import get_opt_query_data
 
 
 class TestGetOptQueryData(unittest.TestCase):
@@ -25,24 +26,24 @@ class TestGetOptQueryData(unittest.TestCase):
     def test_get_opt_query_data(self):
         main_dir = ""
         parameter_data_file = main_dir + "test/placement-tests/request.json"
-        policy_data_path = main_dir + "test/policy-local-files/new_policies/"
+        policy_data_path = main_dir + "test/policy-local-files/"
 
         query_policy_data_file = ["QueryPolicy_vCPE.json"]
         request_json = json.loads(open(parameter_data_file).read())
         policies = [json.loads(open(policy_data_path + file).read()) for file in query_policy_data_file]
-        req_param_dict = get_opt_query_data(request_json, policies)
+        req_param_dict = get_opt_query_data(request_json['placementInfo']['requestParameters'], policies)
 
         self.assertTrue(req_param_dict is not None)
 
     def test_get_opt_query_data_vfmod(self):
         main_dir = ""
         parameter_data_file = main_dir + "test/placement-tests/request_vfmod.json"
-        policy_data_path = main_dir + "test/policy-local-files/new_policies/"
+        policy_data_path = main_dir + "test/policy-local-files/"
 
         query_policy_data_file = ["QueryPolicy_vFW_TD.json"]
         request_json = json.loads(open(parameter_data_file).read())
         policies = [json.loads(open(policy_data_path + file).read()) for file in query_policy_data_file]
-        req_param_dict = get_opt_query_data(request_json, policies)
+        req_param_dict = get_opt_query_data(request_json['placementInfo']['requestParameters'], policies)
 
         self.assertTrue(req_param_dict is not None)