X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test%2Ftest_api_validation.py;h=3a2026294be051620834f2116627b7f8a36a31a5;hb=HEAD;hp=80e0ba032305eaf71dfcd3d3d6cf1bb059a09bbe;hpb=1a9638f5d5fc78f7e8be700e71b506fed3cc9d2d;p=optf%2Fosdf.git

diff --git a/test/test_api_validation.py b/test/test_api_validation.py
index 80e0ba0..3a20262 100644
--- a/test/test_api_validation.py
+++ b/test/test_api_validation.py
@@ -18,9 +18,13 @@
 import json
 import unittest
 
-from osdf.models.api.placementRequest import PlacementAPI
-from osdf.models.api.placementResponse import PlacementResponse
-from schematics.exceptions import ModelValidationError
+from schematics.exceptions import DataError
+
+from apps.placement.models.api.placementRequest import PlacementAPI
+from apps.placement.models.api.placementResponse import PlacementResponse
+from apps.slice_selection.models.api.nsi_selection_request import NSISelectionAPI
+from apps.slice_selection.models.api.nssi_selection_request import NSSISelectionAPI
+from apps.nxi_termination.models.api.nxi_termination_request import NxiTerminationApi
 
 
 class TestReqValidation(unittest.TestCase):
@@ -30,9 +34,44 @@ class TestReqValidation(unittest.TestCase):
         req_json = json.loads(open(req_file).read())
         self.assertEqual(PlacementAPI(req_json).validate(), None)
 
+    def test_req_vfmod_validation(self):
+        req_file = "./test/placement-tests/request_vfmod.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(PlacementAPI(req_json).validate(), None)
+
+    def test_req_nsi_validation(self):
+        req_file = "./test/apps/slice_selection/nsi_selection_request.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(NSISelectionAPI(req_json).validate(), None)
+
+    def test_req_invalid_nsi(self):
+        req_file = "./test/apps/slice_selection/nsi_selection_invalid_request.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertRaises(DataError, lambda: NSISelectionAPI(req_json).validate())
+
+    def test_req_nssi_validation(self):
+        req_file = "./test/apps/slice_selection/nssi_selection_request.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(NSSISelectionAPI(req_json).validate(), None)
+
+    def test_req_invalid_nssi(self):
+        req_file = "./test/apps/slice_selection/nssi_selection_invalid_request.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertRaises(DataError, lambda: NSSISelectionAPI(req_json).validate())
+
     def test_req_failure(self):
         req_json = {}
-        self.assertRaises(ModelValidationError, lambda: PlacementAPI(req_json).validate())
+        self.assertRaises(DataError, lambda: PlacementAPI(req_json).validate())
+
+    def test_req_nxi_validation(self):
+        req_file = "./test/apps/nxi_termination/nxi_termination.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(NxiTerminationApi(req_json).validate(), None)
+
+    def test_req_invalid_nxi(self):
+        req_file = "./test/apps/nxi_termination/invalid_request.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertRaises(DataError, lambda: NxiTerminationApi(req_json).validate())
 
 
 class TestResponseValidation(unittest.TestCase):
@@ -42,9 +81,14 @@ class TestResponseValidation(unittest.TestCase):
         req_json = json.loads(open(req_file).read())
         self.assertEqual(PlacementResponse(req_json).validate(), None)
 
+    def test_res_vfmod_validation(self):
+        req_file = "./test/placement-tests/response_vfmod.json"
+        req_json = json.loads(open(req_file).read())
+        self.assertEqual(PlacementResponse(req_json).validate(), None)
+
     def test_invalid_response(self):
         resp_json = {}
-        self.assertRaises(ModelValidationError, lambda: PlacementResponse(resp_json).validate())
+        self.assertRaises(DataError, lambda: PlacementResponse(resp_json).validate())
 
 
 if __name__ == "__main__":