X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftransportpce_tests%2Fpce%2Ftest03_gnpy.py;h=5a72ca754511491e8bdc79a984b6e85d4904a4ad;hb=1e2f9a502de80450411761fd2f636e2b7ee32301;hp=57e1296204cd5133984575bbf89d1c01ea8d3104;hpb=f16a23bbe46cdff5c2f97f7229a29563090ae81e;p=transportpce.git

diff --git a/tests/transportpce_tests/pce/test03_gnpy.py b/tests/transportpce_tests/pce/test03_gnpy.py
index 57e129620..5a72ca754 100644
--- a/tests/transportpce_tests/pce/test03_gnpy.py
+++ b/tests/transportpce_tests/pce/test03_gnpy.py
@@ -36,8 +36,8 @@ class TransportGNPYtesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         # pylint: disable=bare-except
+        sample_files_parsed = False
         try:
-            sample_files_parsed = False
             TOPO_CLLINET_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                              "..", "..", "sample_configs", "gnpy", "clliNetwork.json")
             with open(TOPO_CLLINET_FILE, 'r', encoding='utf-8') as topo_cllinet:
@@ -141,11 +141,8 @@ class TransportGNPYtesting(unittest.TestCase):
                                                            "service-format": "Ethernet", "clli": "Node1"},
                                                        {"node-id": "XPONDER-5", "service-rate": "100",
                                                            "service-format": "Ethernet", "clli": "Node5"},
-                                                       {"include_": {"ordered-hops": [
-                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
-                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}},
-                                                           {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}
-                                                        })
+                                                       {"include": {"node-id": [
+                                                           "OpenROADM-2", "OpenROADM-3", "OpenROADM-4"]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
@@ -172,10 +169,8 @@ class TransportGNPYtesting(unittest.TestCase):
                                                            "service-format": "Ethernet", "clli": "Node1"},
                                                        {"node-id": "XPONDER-4", "service-rate": "100",
                                                            "service-format": "Ethernet", "clli": "Node5"},
-                                                       {"include_": {"ordered-hops": [
-                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
-                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}
-                                                        })
+                                                       {"include": {"node-id": [
+                                                           "OpenROADM-2", "OpenROADM-3"]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
@@ -200,11 +195,9 @@ class TransportGNPYtesting(unittest.TestCase):
                                                            "service-format": "Ethernet", "clli": "Node1"},
                                                        {"node-id": "XPONDER-4", "service-rate": "400",
                                                            "service-format": "Ethernet", "clli": "Node4"},
-                                                       {"include_": {"ordered-hops": [
-                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-3"}},
-                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-2"}},
-                                                           {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-5"}}]}
-                                                        })
+                                                       {"include": {"node-id": [
+                                                           "OpenROADM-3", "OpenROADM-2",
+                                                           "OpenROADM-5"]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][