X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test%2Ftest_process_placement_opt.py;h=8a29100ad5074eebfa80a001000743cc02f84889;hb=HEAD;hp=3219675a3eb515230a9512a4847119c671745fca;hpb=3a7fa64c8995642dbd2a5696eb8511adc65f2f5d;p=optf%2Fosdf.git

diff --git a/test/test_process_placement_opt.py b/test/test_process_placement_opt.py
index 3219675..8a29100 100644
--- a/test/test_process_placement_opt.py
+++ b/test/test_process_placement_opt.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.
@@ -20,8 +21,9 @@ import unittest
 
 from flask import Response
 from mock import patch
+
+from apps.placement.optimizers.conductor.remote_opt_processor import process_placement_opt
 from osdf.adapters.local_data import local_policies
-from osdf.optimizers.placementopt.conductor.remote_opt_processor import process_placement_opt
 from osdf.utils.interfaces import json_from_file, yaml_from_file
 
 
@@ -29,12 +31,14 @@ class TestProcessPlacementOpt(unittest.TestCase):
 
     def setUp(self):
         mock_req_accept_message = Response("Accepted Request", content_type='application/json; charset=utf-8')
-        self.patcher_req = patch('osdf.optimizers.placementopt.conductor.conductor.request',
-                                 return_value={"solutionInfo": {"placementInfo": "dummy"}})
+        conductor_response_file = 'test/placement-tests/conductor_response.json'
+        conductor_response = json_from_file(conductor_response_file)
+        self.patcher_req = patch('osdf.adapters.conductor.conductor.request',
+                                 return_value=conductor_response)
         self.patcher_req_accept = patch('osdf.operation.responses.osdf_response_for_request_accept',
                                         return_value=mock_req_accept_message)
         self.patcher_callback = patch(
-            'osdf.optimizers.placementopt.conductor.remote_opt_processor.process_placement_opt',
+            'apps.placement.optimizers.conductor.remote_opt_processor.process_placement_opt',
             return_value=mock_req_accept_message)
         self.patcher_RestClient = patch(
             'osdf.utils.interfaces.RestClient', return_value=mock.MagicMock())
@@ -76,6 +80,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()