Traffic Distributtion support added

[optf/osdf.git] / test / conductor / test_conductor_translation.py

diff --git a/test/conductor/test_conductor_translation.py b/test/conductor/test_conductor_translation.py
index 0c7da94..27711f5 100644 (file)
--- a/test/conductor/test_conductor_translation.py
+++ b/test/conductor/test_conductor_translation.py
@@ -28,16 +28,18 @@ from osdf.utils.interfaces import json_from_file, yaml_from_file
 class TestConductorTranslation(unittest.TestCase):
 
     def setUp(self):
-        main_dir = ""
-        conductor_api_template = main_dir + "osdf/templates/conductor_interface.json"
-        parameter_data_file = main_dir + "test/placement-tests/request.json"
-        policy_data_path = main_dir + "test/policy-local-files/"
-        local_config_file = main_dir + "config/common_config.yaml"
+        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"
 
         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)
 
+        parameter_data_file = self.main_dir + "test/placement-tests/request.json"
         self.request_json = json_from_file(parameter_data_file)
+        parameter_data_file = self.main_dir + "test/placement-tests/request_vfmod.json"
+        self.request_vfmod_json = json_from_file(parameter_data_file)
         self.policies = [json_from_file(policy_data_path + '/' + name) for name in valid_policies_files]
 
     def tearDown(self):
@@ -49,6 +51,12 @@ class TestConductorTranslation(unittest.TestCase):
         res = tr.gen_demands(self.request_json, vnf_policies)
         assert res is not None
 
+    def test_gen_vfmod_demands(self):
+        # need to run this only on vnf policies
+        vnf_policies = [x for x in self.policies if x["content"]["policyType"] == "vnfPolicy"]
+        res = tr.gen_demands(self.request_vfmod_json, vnf_policies)
+        assert res is not None
+
 
 if __name__ == "__main__":
     unittest.main()