X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Fpce%2Ftest01_pce.py;h=d31f79588d1bd4061514eb4c023494aa00e01dac;hb=1e2f9a502de80450411761fd2f636e2b7ee32301;hp=e20a04a1b4a5af5dffe18b6c4b8fdc127400c768;hpb=80c1e9a96ad3e992fb6504463ce1eaacd1e5a7e9;p=transportpce.git

diff --git a/tests/transportpce_tests/pce/test01_pce.py b/tests/transportpce_tests/pce/test01_pce.py
index e20a04a1b..d31f79588 100644
--- a/tests/transportpce_tests/pce/test01_pce.py
+++ b/tests/transportpce_tests/pce/test01_pce.py
@@ -34,8 +34,8 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         # pylint: disable=bare-except
+        sample_files_parsed = False
         try:
-            sample_files_parsed = False
             TOPO_BI_DIR_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                             "..", "..", "sample_configs", "honeynode-topo.xml")
             with open(TOPO_BI_DIR_FILE, 'r', encoding='utf-8') as topo_bi_dir:
@@ -256,52 +256,15 @@ class TransportPCEtesting(unittest.TestCase):
     def test_18_success1_path_computation(self):
         response = test_utils.path_computation_request("request1", "service1",
                                                        {"service-format": "Ethernet", "service-rate": "100",
-                                                        "clli": "ORANGE2", "node-id": "XPONDER-2-2",
-                                                        "tx-direction": {"port": {
-                                                            "port-device-name": "Some port-device-name",
-                                                            "port-type": "Some port-type",
-                                                            "port-name": "Some port-name",
-                                                            "port-rack": "Some port-rack",
-                                                            "port-shelf": "Some port-shelf",
-                                                            "port-slot": "Some port-slot",
-                                                            "port-sub-slot": "Some port-sub-slot"
-                                                        }},
-                                                           "rx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }}},
+                                                        "clli": "ORANGE2", "node-id": "XPONDER-2-2"},
                                                        {"service-format": "Ethernet", "service-rate": "100",
-                                                           "clli": "ORANGE1", "node-id": "XPONDER-1-2",
-                                                           "tx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }},
-                                                           "rx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }}},
+                                                           "clli": "ORANGE1", "node-id": "XPONDER-1-2"},
                                                        {"customer-code": ["Some customer-code"],
                                                            "co-routing": {"existing-service": ["Some existing-service"]}
                                                         },
                                                        {"customer-code": ["Some customer-code"],
                                                            "co-routing": {"existing-service": ["Some existing-service"]}
-                                                        },
-                                                       "hop-count", {"locally-protected-links": "true"})
+                                                        }, "hop-count")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -332,7 +295,7 @@ class TransportPCEtesting(unittest.TestCase):
                                                            "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
                                                        {"service-rate": "100", "service-format": "Ethernet",
                                                            "node-id": "XPONDER-3-2", "clli": "ORANGE3"},
-                                                       {"exclude_": {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}})
+                                                       {"exclude": {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',