Traffic Distributtion support added

* New local polcies for vFW TD use case
* Fixed encoding for conductor_request template and parameters
  section modified to accept all requestParameters
* Conductor request can have many attributes in the
  'attributes' section - all that are defined in the vnf policy file
* Conductor request can have many request parameters in the
  'requestParameters' section. The parameters come from QueryPolicies.
  Before list of suppoted parameters was hardcoded
* Optional 'unique' parameter added to the placementDemand section.
  It is already supported by conductor for all inventory types
* Improved debug logs for local policies
* Unit tests added for expanded request format

Change-Id: I41f219c366a3a77881c7096e64a6272edbada23b
Issue-ID: OPTFRA-443
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>

1 files changed, 52 insertions, 40 deletions

diff --git a/test/test_get_opt_query_data.py b/test/test_get_opt_query_data.py
index 880f93f..1e2db17 100644
--- a/test/test_get_opt_query_data.py
+++ b/test/test_get_opt_query_data.py
@@ -1,40 +1,52 @@
-# -------------------------------------------------------------------------

-#   Copyright (c) 2017-2018 AT&T Intellectual Property

-#

-#   Licensed under the Apache License, Version 2.0 (the "License");

-#   you may not use this file except in compliance with the License.

-#   You may obtain a copy of the License at

-#

-#       http://www.apache.org/licenses/LICENSE-2.0

-#

-#   Unless required by applicable law or agreed to in writing, software

-#   distributed under the License is distributed on an "AS IS" BASIS,

-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-#   See the License for the specific language governing permissions and

-#   limitations under the License.

-#

-# -------------------------------------------------------------------------

-#

-import unittest

-import json

-from osdf.optimizers.placementopt.conductor.translation import get_opt_query_data

-

-

-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/"

-        

-        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)

-        

-        self.assertTrue(req_param_dict is not None)

-

-

-if __name__ == "__main__":

-    unittest.main()

-

+# -------------------------------------------------------------------------
+#   Copyright (c) 2017-2018 AT&T Intellectual Property
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+# -------------------------------------------------------------------------
+#
+import unittest
+import json
+from osdf.optimizers.placementopt.conductor.translation import get_opt_query_data
+
+
+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/"
+
+        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)
+
+        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/"
+
+        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)
+
+        self.assertTrue(req_param_dict is not None)
+
+
+if __name__ == "__main__":
+    unittest.main()
+