Merge changes I1ed16552,Ia080da84

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_otn_sh_renderer.py

diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
index 9b90d2cb2bd496e9e4151df6f4cd3f1fd71ad86b..0d6113ed1c12642bb67fef0d154d38811718d49c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
@@ -91,15 +91,29 @@ class TransportPCEtesting(unittest.TestCase):
                                 "id": "0",
                                 "resource": {
                                     "tp-node-id": "SPDR-SA1-XPDR1",
-                                    "tp-id": "XPDR1-NETWORK1"
+                                    "tp-id": ""
                                 }
                             },
                             {
                                 "id": "1",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SA1-XPDR1",
+                                    "tp-id": "XPDR1-NETWORK1"
+                                }
+                            },
+                            {
+                                "id": "2",
                                 "resource": {
                                     "tp-node-id": "SPDR-SC1-XPDR1",
                                     "tp-id": "XPDR1-NETWORK1"
                                 }
+                            },
+                            {
+                                "id": "3",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SC1-XPDR1",
+                                    "tp-id": ""
+                                }
                             }
                         ]
                     },
@@ -112,15 +126,29 @@ class TransportPCEtesting(unittest.TestCase):
                                 "id": "0",
                                 "resource": {
                                     "tp-node-id": "SPDR-SC1-XPDR1",
-                                    "tp-id": "XPDR1-NETWORK1"
+                                    "tp-id": ""
                                 }
                             },
                             {
                                 "id": "1",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SC1-XPDR1",
+                                    "tp-id": "XPDR1-NETWORK1"
+                                }
+                            },
+                            {
+                                "id": "2",
                                 "resource": {
                                     "tp-node-id": "SPDR-SA1-XPDR1",
                                     "tp-id": "XPDR1-NETWORK1"
                                 }
+                            },
+                            {
+                                "id": "3",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SA1-XPDR1",
+                                    "tp-id": ""
+                                }
                             }
                         ]
                     }
@@ -252,6 +280,13 @@ class TransportPCEtesting(unittest.TestCase):
                     "aToZ-direction": {
                         "rate": 100,
                         "aToZ": [
+                            {
+                                "id": "0",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SA1-XPDR1",
+                                    "tp-id": ""
+                                }
+                            },
                             {
                                 "id": "1",
                                 "resource": {
@@ -265,12 +300,26 @@ class TransportPCEtesting(unittest.TestCase):
                                     "tp-node-id": "SPDR-SC1-XPDR1",
                                     "tp-id": "XPDR1-NETWORK1"
                                 }
+                            },
+                            {
+                                "id": "3",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SC1-XPDR1",
+                                    "tp-id": ""
+                                }
                             }
                         ]
                     },
                     "transportpce-renderer:zToA-direction": {
                         "transportpce-renderer:rate": "100",
                         "zToA": [
+                            {
+                                "id": "0",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SC1-XPDR1",
+                                    "tp-id": ""
+                                }
+                            },
                             {
                                 "id": "1",
                                 "resource": {
@@ -284,6 +333,13 @@ class TransportPCEtesting(unittest.TestCase):
                                     "tp-node-id": "SPDR-SA1-XPDR1",
                                     "tp-id": "XPDR1-NETWORK1"
                                 }
+                            },
+                            {
+                                "id": "3",
+                                "resource": {
+                                    "tp-node-id": "SPDR-SA1-XPDR1",
+                                    "tp-id": ""
+                                }
                             }
                         ]
                     }
@@ -371,7 +427,6 @@ class TransportPCEtesting(unittest.TestCase):
                     "transportpce-renderer:service-rate": "10",
                     "transportpce-renderer:clli": "nodeSA",
                     "transportpce-renderer:node-id": "SPDR-SA1"
-
                 },
                 "transportpce-renderer:service-z-end": {
                     "transportpce-renderer:service-format": "Ethernet",
@@ -382,6 +437,8 @@ class TransportPCEtesting(unittest.TestCase):
                 "transportpce-renderer:path-description": {
                     "aToZ-direction": {
                         "rate": 10,
+                        "trib-port-number": 1,
+                        "trib-slot-number": 1,
                         "aToZ": [
                             {
                                 "id": "0",
@@ -415,7 +472,9 @@ class TransportPCEtesting(unittest.TestCase):
                         ]
                     },
                     "transportpce-renderer:zToA-direction": {
-                        "transportpce-renderer:rate": "10",
+                        "rate": "10",
+                        "trib-port-number": 1,
+                        "trib-slot-number": 1,
                         "zToA": [
                             {
                                 "id": "0",