X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test%2Fconductor%2Ftest_conductor_calls.py;h=8b4411db58f5deaa57c15fec7d5511d6efbc0729;hb=HEAD;hp=1a96da7b0adb4e831f7940497822d221826d9503;hpb=ab7a87456538e561d60d209fe534c175ddd0269c;p=optf%2Fosdf.git

diff --git a/test/conductor/test_conductor_calls.py b/test/conductor/test_conductor_calls.py
index 1a96da7..8b4411d 100644
--- a/test/conductor/test_conductor_calls.py
+++ b/test/conductor/test_conductor_calls.py
@@ -1,5 +1,6 @@
 # -------------------------------------------------------------------------
 #   Copyright (c) 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
 
-from osdf.optimizers.placementopt.conductor import conductor
+from osdf.adapters.conductor import conductor
 import osdf.config.loader as config_loader
 from osdf.utils.interfaces import json_from_file
 from osdf.utils.programming_utils import DotDict
@@ -34,6 +35,10 @@ class TestConductorCalls(unittest.TestCase):
         self.osdf_config = DotDict(config_loader.all_configs(**self.config_spec))
         self.lp = self.osdf_config.core.get('osdf_temp', {}).get('local_policies', {}
                                                                  ).get('placement_policy_files_vcpe')
+        self.template_fields = {
+            'location_enabled': True,
+            'version': '2017-10-10'
+        }
 
     def tearDown(self):
         pass
@@ -41,7 +46,22 @@ 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/", self.lp)
-        conductor.request(req_json, self.osdf_config, policies)
+        req_info = req_json['requestInfo']
+        demands = req_json['placementInfo']['placementDemands']
+        request_parameters = req_json['placementInfo']['requestParameters']
+        service_info = req_json['serviceInfo']
+        conductor.request(req_info, demands, request_parameters, service_info, self.template_fields,
+                          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/", self.lp)
+        req_info = req_json['requestInfo']
+        demands = req_json['placementInfo']['placementDemands']
+        request_parameters = req_json['placementInfo']['requestParameters']
+        service_info = req_json['serviceInfo']
+        conductor.request(req_info, demands, request_parameters, service_info, self.template_fields,
+                          self.osdf_config, policies)
 
 
 if __name__ == "__main__":